From cf458d83eb68b210c52cdd40afc992f7ee2139aa Mon Sep 17 00:00:00 2001 From: Giovanni Bechis Date: Mon, 17 Feb 2020 07:52:55 +0000 Subject: [PATCH] fix build with LibreSSL 2.0.7+ bz 64047 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1874101 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_init.c | 2 +- modules/ssl/ssl_private.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index e378218be51..29810726c58 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -1624,7 +1624,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s, X509_STORE_CTX *sctx; X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx); -#if OPENSSL_VERSION_NUMBER >= 0x1010100fL +#if OPENSSL_VERSION_NUMBER >= 0x1010100fL && !defined(LIBRESSL_VERSION_NUMBER) /* For OpenSSL >=1.1.1, turn on client cert support which is * otherwise turned off by default (by design). * https://github.com/openssl/openssl/issues/6933 */ diff --git a/modules/ssl/ssl_private.h b/modules/ssl/ssl_private.h index c415976fad0..a8b219c280b 100644 --- a/modules/ssl/ssl_private.h +++ b/modules/ssl/ssl_private.h @@ -228,9 +228,11 @@ #define BN_get_rfc3526_prime_4096 get_rfc3526_prime_4096 #define BN_get_rfc3526_prime_6144 get_rfc3526_prime_6144 #define BN_get_rfc3526_prime_8192 get_rfc3526_prime_8192 +#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL #define BIO_set_init(x,v) (x->init=v) #define BIO_get_data(x) (x->ptr) #define BIO_set_data(x,v) (x->ptr=v) +#endif #define BIO_get_shutdown(x) (x->shutdown) #define BIO_set_shutdown(x,v) (x->shutdown=v) #define DH_bits(x) (BN_num_bits(x->p)) -- 2.47.3