From 5a56d540861e91b259be58e822527dc56dc6700a Mon Sep 17 00:00:00 2001 From: Ralph Dolmans Date: Thu, 15 Sep 2016 14:40:42 +0000 Subject: [PATCH] Check for LibreSSL usage when OpenSSL version number >= 1.1 git-svn-id: file:///svn/unbound/trunk@3862 be551aaa-1e26-0410-a405-d3ace91eadb9 --- daemon/remote.c | 2 +- sldns/keyraw.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 65c4fe4df..3fe6650b4 100644 --- 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 8498def7e..e8f2da089 100644 --- 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;