[patch] patch for LibreSSL-2.8.2 compatibility.

libre282.patch (text/plain), 3.88 KB, created by pagorman on 2018-11-02 05:16:41 UTC

--- a/lib/dns/openssldh_link.c	2018-01-04 00:28:11.000000000 -0500
+++ b/lib/dns/openssldh_link.c	2018-11-02 00:40:01.510848847 -0400
@@ -73,7 +73,7 @@
  * DH_get0_key, DH_set0_key, DH_get0_pqg and DH_set0_pqg
  * are from OpenSSL 1.1.0.
  */
-static void
+void
 DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) {
 	if (pub_key != NULL)
 		*pub_key = dh->pub_key;
@@ -81,7 +81,7 @@
 		*priv_key = dh->priv_key;
 }
 
-static int
+int
 DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key) {
 	/* Note that it is valid for priv_key to be NULL */
 	if (pub_key == NULL)
@@ -95,7 +95,7 @@
 	return 1;
 }
 
-static void
+void
 DH_get0_pqg(const DH *dh,
 	    const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
 {
@@ -107,7 +107,7 @@
 		*g = dh->g;
 }
 
-static int
+int
 DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
 	/* q is optional */
 	if (p == NULL || g == NULL)
--- a/lib/dns/openssldsa_link.c	2018-11-02 00:51:47.753837303 -0400
+++ b/lib/dns/openssldsa_link.c	2018-11-02 00:56:25.781832758 
-0400
@@ -49,7 +49,7 @@
 static isc_result_t openssldsa_todns(const dst_key_t *key, isc_buffer_t *data);
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-static void
+void
 DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q,
 	     const BIGNUM **g)
 {
@@ -61,7 +61,7 @@
 		*g = d->g;
 }
 
-static int
+int
 DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g) {
 	if (p == NULL || q == NULL || g == NULL)
 		return 0;
@@ -75,7 +75,7 @@
 	return 1;
 }
 
-static void
+void
 DSA_get0_key(const DSA *d, const BIGNUM **pub_key, const BIGNUM **priv_key) {
 	if (pub_key != NULL)
 		*pub_key = d->pub_key;
@@ -83,7 +83,7 @@
 		*priv_key = d->priv_key;
 }
 
-static int
+int
 DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key) {
 	/* Note that it is valid for priv_key to be NULL */
 	if (pub_key == NULL)
@@ -97,13 +97,13 @@
 	return 1;
 }
 
-static void
+void
 DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) {
 	*pr = sig->r;
 	*ps = sig->s;
 }
 
-static int
+int
 DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s) {
 	if (r == NULL || s == NULL)
 		return 0;
--- a/lib/dns/opensslecdsa_link.c	2018-01-04 00:28:11.000000000  -0500
+++ b/lib/dns/opensslecdsa_link.c	2018-11-02 01:01:45.842827527  -0400
@@ -43,7 +43,7 @@
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 /* From OpenSSL 1.1 */
-static void
+void
 ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) {
 	if (pr != NULL)
 		*pr = sig->r;
@@ -51,7 +51,7 @@
 		*ps = sig->s;
 }
 
-static int
+int
 ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s) {
 	if (r == NULL || s == NULL)
 		return 0;
--- a/lib/dns/opensslrsa_link.c	2018-01-04 00:28:11.000000000 -0500
+++ b/lib/dns/opensslrsa_link.c	2018-11-02 01:08:17.704821122 
-0400
@@ -122,7 +122,7 @@
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
 /* From OpenSSL 1.1.0 */
-static int
+int
 RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {
 
 	/*
@@ -149,7 +149,7 @@
 	return 1;
 }
 
-static int
+int
 RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q) {
 
 	/*
@@ -171,7 +171,7 @@
 	return 1;
 }
 
-static int
+int
 RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp) {
 	/*
 	 * If the fields dmp1, dmq1 and iqmp in r are NULL, the
@@ -198,7 +198,7 @@
 	return 1;
 }
 
-static void
+void
 RSA_get0_key(const RSA *r,
 	     const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
 {
@@ -210,7 +210,7 @@
 		*d = r->d;
 }
 
-static void
+void
 RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q) {
 	if (p != NULL)
 		*p = r->p;
@@ -218,7 +218,7 @@
 	*q = r->q;
 }
 
-static void
+void
 RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1,
 		    const BIGNUM **iqmp)
 {
@@ -230,7 +230,7 @@
 		*iqmp = r->iqmp;
 }
 
-static int
+int
 RSA_test_flags(const RSA *r, int flags) {
 	return (r->flags & flags);
 }