diff --git a/lib/dns/openssl_link.c b/lib/dns/openssl_link.c index 0527e74505..c4d30e1e89 100644 --- a/lib/dns/openssl_link.c +++ b/lib/dns/openssl_link.c @@ -279,7 +279,7 @@ dst__openssl_init(const char *engine) { void dst__openssl_destroy(void) { -#if OPENSSL_VERSION_NUMBER >= 0x10100000L +#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10100000L) OPENSSL_cleanup(); if (rm != NULL) { mem_free(rm FILELINE); diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c index c08eeaf50d..f334230a1c 100644 --- a/lib/dns/openssldh_link.c +++ b/lib/dns/openssldh_link.c @@ -216,8 +216,7 @@ openssldh_paramcompare(const dst_key_t *key1, const dst_key_t *key2) { #if OPENSSL_VERSION_NUMBER > 0x00908000L static int -progress_cb(int p, int n, BN_GENCB *cb) -{ +progress_cb(int p, int n, BN_GENCB *cb) { union { void *dptr; void (*fptr)(int); diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c index 2b55bc4650..ba583dc026 100644 --- a/lib/dns/openssldsa_link.c +++ b/lib/dns/openssldsa_link.c @@ -414,8 +414,7 @@ openssldsa_compare(const dst_key_t *key1, const dst_key_t *key2) { #if OPENSSL_VERSION_NUMBER > 0x00908000L static int -progress_cb(int p, int n, BN_GENCB *cb) -{ +progress_cb(int p, int n, BN_GENCB *cb) { union { void *dptr; void (*fptr)(int); diff --git a/lib/dns/opensslecdsa_link.c b/lib/dns/opensslecdsa_link.c index 76d5a9dc5b..42b929a33e 100644 --- a/lib/dns/opensslecdsa_link.c +++ b/lib/dns/opensslecdsa_link.c @@ -41,7 +41,7 @@ #define DST_RET(a) {ret = a; goto err;} -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) /* From OpenSSL 1.1 */ static void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) { diff --git a/lib/dns/opensslgost_link.c b/lib/dns/opensslgost_link.c index 62d7238bb7..1ea60607a8 100644 --- a/lib/dns/opensslgost_link.c +++ b/lib/dns/opensslgost_link.c @@ -28,7 +28,7 @@ #include #include -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) #define EVP_MD_CTX_new() &(ctx->_ctx), EVP_MD_CTX_init(&(ctx->_ctx)) #define EVP_MD_CTX_free(ptr) EVP_MD_CTX_cleanup(ptr) #endif diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c index 89b4975c63..b82159df56 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c @@ -121,7 +121,7 @@ #endif #define DST_RET(a) {ret = a; goto err;} -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) /* From OpenSSL 1.1.0 */ static int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {