Check for LibreSSL usage when OpenSSL version number >= 1.1

git-svn-id: file:///svn/unbound/trunk@3862 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/daemon/remote.c b/daemon/remote.c
index 65c4fe4df216a743872a0f33d59e95ea3d463efa..3fe6650b4ba66f095e0a391857a160ff8aeaf234 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -185,7 +185,7 @@ static DH *get_dh2048(void)
        if (!dh || !p || !g)
                goto err;
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
        dh->p = p;
        dh->g = g;
 #else

diff --git a/sldns/keyraw.c b/sldns/keyraw.c
index 8498def7ef55c521b3a1b4ce9ee98ae3336b0699..e8f2da089d6a501bb401ba0db0202c0d5e8b3e5e 100644 (file)
--- a/sldns/keyraw.c
+++ b/sldns/keyraw.c
@@ -224,7 +224,7 @@ sldns_key_buf2dsa_raw(unsigned char* key, size_t len)
                BN_free(Y);
                return NULL;
        }
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
 #ifndef S_SPLINT_S
        dsa->p = P;
        dsa->q = Q;
@@ -302,7 +302,7 @@ sldns_key_buf2rsa_raw(unsigned char* key, size_t len)
                BN_free(modulus);
                return NULL;
        }
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
 #ifndef S_SPLINT_S
        rsa->n = modulus;
        rsa->e = exponent;