File fix-build-with-libnettle-3.5.patch of Package pihole-ftl

Overview Repositories Revisions Requests Users Attributes Meta

File fix-build-with-libnettle-3.5.patch of Package pihole-ftl (Revision 0c1b5949f8936bca4c9ae759f6e5cf63)

Currently displaying revision 0c1b5949f8936bca4c9ae759f6e5cf63 , Show latest

From c8f86dfaa752dd002942b6410a79b0e805fd9c71 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
Upstream: patch is from upstream

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 dnsmasq/crypto.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/dnsmasq/crypto.c b/src/dnsmasq/crypto.c
index ebb871e..fecc64a 100644
--- a/src/dnsmasq/crypto.c
+++ b/src/dnsmasq/crypto.c
@@ -275,6 +275,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)
     {
@@ -294,7 +298,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;
@@ -307,7 +311,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;
--
2.16.4

Places

File fix-build-with-libnettle-3.5.patch of Package pihole-ftl (Revision 0c1b5949f8936bca4c9ae759f6e5cf63)

Places