libunbound: Fix build with opaque RSA and DSA in LibreSSL 3.5.

Same diff was just committed to base.
This commit is contained in:
tb 2022-01-09 18:50:06 +00:00
parent 60a271041b
commit 249eccbcd4
2 changed files with 27 additions and 1 deletions

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.19 2021/12/29 14:24:08 sthen Exp $
# $OpenBSD: Makefile,v 1.20 2022/01/09 18:50:06 tb Exp $
COMMENT= validating DNS resolver library
DISTNAME= unbound-1.14.0
PKGNAME= lib${DISTNAME}
REVISION= 0
SHARED_LIBS += unbound 4.1 # 9.3

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-sldns_keyraw_c,v 1.1 2022/01/09 18:50:07 tb Exp $
Fix build with opaque DSA and RSA in LibreSSL 3.5.
Index: sldns/keyraw.c
--- sldns/keyraw.c.orig
+++ sldns/keyraw.c
@@ -250,7 +250,7 @@ sldns_key_buf2dsa_raw(unsigned char* key, size_t len)
if(!(dsa = DSA_new())) {
return NULL;
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
+#if OPENSSL_VERSION_NUMBER < 0x10100000
#ifndef S_SPLINT_S
dsa->p = P;
dsa->q = Q;
@@ -428,7 +428,7 @@ sldns_key_buf2rsa_raw(unsigned char* key, size_t len)
BN_free(modulus);
return NULL;
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
+#if OPENSSL_VERSION_NUMBER < 0x10100000
#ifndef S_SPLINT_S
rsa->n = modulus;
rsa->e = exponent;