summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Strauss <gstrauss@gluelogic.com>2020-11-04 22:47:36 -0500
committerGlenn Strauss <gstrauss@gluelogic.com>2020-11-04 22:47:36 -0500
commit57f450f1992fc4e28cf85969eeebccb240df4303 (patch)
treee5b02e37dc91379f0bed4ea13f500ca0d750e3e0
parent8e1394ea49d045127df92b1637a434b444943372 (diff)
downloadlighttpd-git-57f450f1992fc4e28cf85969eeebccb240df4303.tar.gz
[mod_openssl] add LIBRESSL_VERSION_NUMBER checks
add some additional LIBRESSL_VERSION_NUMBER checks for feature support
-rw-r--r--src/mod_openssl.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mod_openssl.c b/src/mod_openssl.c
index d3267f94..f6d216c7 100644
--- a/src/mod_openssl.c
+++ b/src/mod_openssl.c
@@ -508,7 +508,8 @@ static int mod_openssl_init_once_openssl (server *srv)
if (ssl_is_init) return 1;
#if OPENSSL_VERSION_NUMBER >= 0x10100000L \
- && !defined(LIBRESSL_VERSION_NUMBER)
+ && (!defined(LIBRESSL_VERSION_NUMBER) \
+ || LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS
|OPENSSL_INIT_LOAD_CRYPTO_STRINGS,NULL);
OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS
@@ -1068,7 +1069,8 @@ mod_openssl_cert_cb (SSL *ssl, void *arg)
}
#if OPENSSL_VERSION_NUMBER >= 0x10002000 \
- && !defined(LIBRESSL_VERSION_NUMBER)
+ && (!defined(LIBRESSL_VERSION_NUMBER) \
+ || LIBRESSL_VERSION_NUMBER >= 0x3000000fL)
if (pc->ssl_pemfile_chain)
SSL_set1_chain(ssl, pc->ssl_pemfile_chain);
#ifndef BORINGSSL_API_VERSION /* BoringSSL limitation */