package/libldns: bump to version 1.8.3
Drop patch (already in version) https://github.com/NLnetLabs/ldns/blob/1.8.3/Changelog Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
Thomas Petazzoni
parent
adaf397f0b
commit
dde7b6dfac
@ -1,96 +0,0 @@
|
||||
From 887d618239312cc8c11e41c45492eee02a8f28a2 Mon Sep 17 00:00:00 2001
|
||||
From: Theo Buehler <tb@openbsd.org>
|
||||
Date: Tue, 11 Jan 2022 21:14:24 +0100
|
||||
Subject: [PATCH] Use accessors for DSA and RSA objects
|
||||
|
||||
In the upcoming LibreSSL version 3.5, the DSA and RSA structs will
|
||||
become opaque, so we should use the OpenSSL 1.1 setters and getters
|
||||
to fix the build. The relevant API has been available since
|
||||
LibreSSL 2.7. The last LibreSSL version (2.6) not having these
|
||||
accessors was EOL late 2018, so no users should be affected by this
|
||||
change.
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/NLnetLabs/ldns/commit/887d618239312cc8c11e41c45492eee02a8f28a2]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
dnssec.c | 4 ++--
|
||||
host2str.c | 4 ++--
|
||||
keys.c | 6 +++---
|
||||
3 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/dnssec.c b/dnssec.c
|
||||
index 63fece52..fbaa518a 100644
|
||||
--- a/dnssec.c
|
||||
+++ b/dnssec.c
|
||||
@@ -381,7 +381,7 @@ ldns_key_buf2dsa_raw(const unsigned char* key, size_t len)
|
||||
BN_free(Y);
|
||||
return NULL;
|
||||
}
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000)
|
||||
#ifndef S_SPLINT_S
|
||||
dsa->p = P;
|
||||
dsa->q = Q;
|
||||
@@ -468,7 +468,7 @@ ldns_key_buf2rsa_raw(const unsigned char* key, size_t len)
|
||||
BN_free(modulus);
|
||||
return NULL;
|
||||
}
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000)
|
||||
#ifndef S_SPLINT_S
|
||||
rsa->n = modulus;
|
||||
rsa->e = exponent;
|
||||
diff --git a/host2str.c b/host2str.c
|
||||
index a207a913..634c5676 100644
|
||||
--- a/host2str.c
|
||||
+++ b/host2str.c
|
||||
@@ -2451,7 +2451,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k)
|
||||
const BIGNUM *n=NULL, *e=NULL, *d=NULL,
|
||||
*p=NULL, *q=NULL, *dmp1=NULL,
|
||||
*dmq1=NULL, *iqmp=NULL;
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000)
|
||||
n = rsa->n;
|
||||
e = rsa->e;
|
||||
d = rsa->d;
|
||||
@@ -2504,7 +2504,7 @@ ldns_key2buffer_str(ldns_buffer *output, const ldns_key *k)
|
||||
if(1) {
|
||||
const BIGNUM *p=NULL, *q=NULL, *g=NULL,
|
||||
*priv_key=NULL, *pub_key=NULL;
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000)
|
||||
#ifndef S_SPLINT_S
|
||||
p = dsa->p;
|
||||
q = dsa->q;
|
||||
diff --git a/keys.c b/keys.c
|
||||
index 91a3dffd..78bea972 100644
|
||||
--- a/keys.c
|
||||
+++ b/keys.c
|
||||
@@ -861,7 +861,7 @@ ldns_key_new_frm_fp_rsa_l(FILE *f, int *line_nr)
|
||||
}
|
||||
#endif /* splint */
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000)
|
||||
# ifndef S_SPLINT_S
|
||||
rsa->n = n;
|
||||
rsa->e = e;
|
||||
@@ -982,7 +982,7 @@ ldns_key_new_frm_fp_dsa_l(FILE *f, ATTR_UNUSED(int *line_nr))
|
||||
}
|
||||
#endif /* splint */
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000)
|
||||
# ifndef S_SPLINT_S
|
||||
dsa->p = p;
|
||||
dsa->q = q;
|
||||
@@ -1660,7 +1660,7 @@ ldns_key_rsa2bin(unsigned char *data, RSA *k, uint16_t *size)
|
||||
if (!k) {
|
||||
return false;
|
||||
}
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(HAVE_LIBRESSL) && LIBRESSL_VERSION_NUMBER < 0x20700000)
|
||||
n = k->n;
|
||||
e = k->e;
|
||||
#else
|
||||
@ -1,7 +1,7 @@
|
||||
# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha1
|
||||
sha1 df19a0404a608821b571525214a18988bc88bb46 ldns-1.8.1.tar.gz
|
||||
# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.1.tar.gz.sha256
|
||||
sha256 958229abce4d3aaa19a75c0d127666564b17216902186e952ca4aef47c6d7fa3 ldns-1.8.1.tar.gz
|
||||
# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.3.tar.gz.sha1
|
||||
sha1 2796cc49636f68260c9662b60d5a7c9e6eed195c ldns-1.8.3.tar.gz
|
||||
# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.8.3.tar.gz.sha256
|
||||
sha256 c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860 ldns-1.8.3.tar.gz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 9e0b1505c358d1a7c79555ee8bd1acbe2985dbc74dd81f3697cebf2161e922e6 LICENSE
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBLDNS_VERSION = 1.8.1
|
||||
LIBLDNS_VERSION = 1.8.3
|
||||
LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz
|
||||
LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns
|
||||
LIBLDNS_LICENSE = BSD-3-Clause
|
||||
|
||||
Loading…
Reference in New Issue
Block a user