47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
|
From 6fd9aba7abe1e084123bc5002959350897774ace Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vladislav Grishenko <themiron@mail.ru>
|
||
|
|
Date: Wed, 26 Jun 2019 20:27:11 +0500
|
||
|
|
Subject: [PATCH] Fix build with libnettle 3.5
|
||
|
|
|
||
|
|
Downloaded from
|
||
|
|
https://github.com/themiron/dnsmasq/commit/6fd9aba7abe1e084123bc5002959350897774ace
|
||
|
|
|
||
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||
|
|
---
|
||
|
|
src/crypto.c | 8 ++++++--
|
||
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/crypto.c b/src/crypto.c
|
||
|
|
index 1f1c12b..9cfe371 100644
|
||
|
|
--- a/src/crypto.c
|
||
|
|
+++ b/src/crypto.c
|
||
|
|
@@ -296,6 +296,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
|
||
|
|
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 < 4
|
||
|
|
+#define nettle_get_secp_256r1() (&nettle_secp_256r1)
|
||
|
|
+#define nettle_get_secp_384r1() (&nettle_secp_384r1)
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
if (!sig_struct)
|
||
|
|
{
|
||
|
|
@@ -315,7 +319,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
|
||
|
|
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;
|
||
|
|
@@ -328,7 +332,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
|
||
|
|
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;
|