View | Details | Raw Unified | Return to bug 226903 | Differences between
and this patch

Collapse All | Expand All

(-)files/patch-lib_dns_openssldh__link.c (+11 lines)
Line 0 Link Here
1 
--- lib/dns/openssldh_link.c.orig	2018-03-25 00:15:52 UTC
2 
+++ lib/dns/openssldh_link.c
3 
@@ -69,7 +69,7 @@ static isc_result_t openssldh_todns(cons
4
5 
 static BIGNUM *bn2, *bn768, *bn1024, *bn1536;
6
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
9 
 /*
10 
  * DH_get0_key, DH_set0_key, DH_get0_pqg and DH_set0_pqg
11 
  * are from OpenSSL 1.1.0.
(-)files/patch-lib_dns_openssldsa__link.c (+11 lines)
Line 0 Link Here
1 
--- lib/dns/openssldsa_link.c.orig	2018-03-25 00:16:57 UTC
2 
+++ lib/dns/openssldsa_link.c
3 
@@ -49,7 +49,7 @@
4
5 
 static isc_result_t openssldsa_todns(const dst_key_t *key, isc_buffer_t *data);
6
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
9 
 static void
10 
 DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q,
11 
 	     const BIGNUM **g)
(-)files/patch-lib_dns_opensslecdsa__link.c (+11 lines)
Line 0 Link Here
1 
--- lib/dns/opensslecdsa_link.c.orig	2018-03-25 00:17:52 UTC
2 
+++ lib/dns/opensslecdsa_link.c
3 
@@ -42,7 +42,7 @@
4
5 
 #define DST_RET(a) {ret = a; goto err;}
6
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
9 
 /* From OpenSSL 1.1 */
10 
 static void
11 
 ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) {
(-)files/patch-lib_dns_opensslrsa__link.c (+11 lines)
Line 0 Link Here
1 
--- lib/dns/opensslrsa_link.c.orig	2018-03-25 00:18:28 UTC
2 
+++ lib/dns/opensslrsa_link.c
3 
@@ -121,7 +121,7 @@
4 
 #endif
5 
 #define DST_RET(a) {ret = a; goto err;}
6
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L )
9 
 /* From OpenSSL 1.1.0 */
10 
 static int
11 
 RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {

Return to bug 226903