opt/dnsmasq/nettle-3.5.patch

35 lines
1.1 KiB
Diff

# http://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2019q2/013096.html
diff -Nru dnsmasq-2.80.orig/src/crypto.c dnsmasq-2.80/src/crypto.c
--- dnsmasq-2.80.orig/src/crypto.c 2019-06-27 16:28:48.474960428 +0200
+++ dnsmasq-2.80/src/crypto.c 2019-06-27 16:33:45.004283079 +0200
@@ -275,6 +275,10 @@
static struct ecc_point *key_256 = NULL, *key_384 = NULL;
static mpz_t x, y;
static struct dsa_signature *sig_struct;
+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 5
+#define nettle_get_secp_256r1() (&nettle_secp_256r1)
+#define nettle_get_secp_384r1() (&nettle_secp_384r1)
+#endif
if (!sig_struct)
{
@@ -294,7 +298,7 @@
if (!(key_256 = whine_malloc(sizeof(struct ecc_point))))
return 0;
- nettle_ecc_point_init(key_256, &nettle_secp_256r1);
+ nettle_ecc_point_init(key_256, nettle_get_secp_256r1());
}
key = key_256;
@@ -307,7 +311,7 @@
if (!(key_384 = whine_malloc(sizeof(struct ecc_point))))
return 0;
- nettle_ecc_point_init(key_384, &nettle_secp_384r1);
+ nettle_ecc_point_init(key_384, nettle_get_secp_384r1());
}
key = key_384;