summaryrefslogtreecommitdiff
path: root/www/apache24/files/patch-modules_ssl_ssl__engine__init.c
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache24/files/patch-modules_ssl_ssl__engine__init.c')
-rw-r--r--www/apache24/files/patch-modules_ssl_ssl__engine__init.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/www/apache24/files/patch-modules_ssl_ssl__engine__init.c b/www/apache24/files/patch-modules_ssl_ssl__engine__init.c
index 1341e4d5eb7d..01515de6a969 100644
--- a/www/apache24/files/patch-modules_ssl_ssl__engine__init.c
+++ b/www/apache24/files/patch-modules_ssl_ssl__engine__init.c
@@ -1,6 +1,6 @@
--- modules/ssl/ssl_engine_init.c.orig 2018-02-13 23:43:36 UTC
+++ modules/ssl/ssl_engine_init.c
-@@ -546,7 +546,7 @@ static apr_status_t ssl_init_ctx_protoco
+@@ -547,7 +547,7 @@ static apr_status_t ssl_init_ctx_protoco
char *cp;
int protocol = mctx->protocol;
SSLSrvConfigRec *sc = mySrvConfig(s);
@@ -9,4 +9,12 @@
int prot;
#endif
+@@ -1492,7 +1492,7 @@ static apr_status_t ssl_init_proxy_certs
+ 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 */