www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

fix build with LibreSSL 2.0.7+

Browse Source 
bz 64047


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1874101 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Giovanni Bechis
2020-02-17 07:52:55 +00:00
parent c8f486d716
commit cf458d83eb
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ssl/ssl_engine_init.c
View File

@@ -1624,7 +1624,7 @@ static apr_status_t ssl_init_proxy_certs(server_rec *s,
X509_STORE_CTX *sctx; X509_STORE_CTX *sctx;
X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx); 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 /* For OpenSSL >=1.1.1, turn on client cert support which is
* otherwise turned off by default (by design). * otherwise turned off by default (by design).
* https://github.com/openssl/openssl/issues/6933 */ * https://github.com/openssl/openssl/issues/6933 */

2
modules/ssl/ssl_private.h
View File

@@ -228,9 +228,11 @@
#define BN_get_rfc3526_prime_4096 get_rfc3526_prime_4096 #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_6144 get_rfc3526_prime_6144
#define BN_get_rfc3526_prime_8192 get_rfc3526_prime_8192 #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_set_init(x,v) (x->init=v)
#define BIO_get_data(x) (x->ptr) #define BIO_get_data(x) (x->ptr)
#define BIO_set_data(x,v) (x->ptr=v) #define BIO_set_data(x,v) (x->ptr=v)
#endif
#define BIO_get_shutdown(x) (x->shutdown) #define BIO_get_shutdown(x) (x->shutdown)
#define BIO_set_shutdown(x,v) (x->shutdown=v) #define BIO_set_shutdown(x,v) (x->shutdown=v)
#define DH_bits(x) (BN_num_bits(x->p)) #define DH_bits(x) (BN_num_bits(x->p))