From 2e251b1c342370b8b3365cf30eca2cf61d9ef559 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Thu, 31 Mar 2016 23:38:38 +0300 Subject: SSL: SSLeay_version() is deprecated in OpenSSL 1.1.0. SSLeay_version() and SSLeay() are no longer available if OPENSSL_API_COMPAT is set to 0x10100000L. Switched to using OpenSSL_version() instead. Additionally, we now compare version strings instead of version numbers, and this correctly works for LibreSSL as well. --- src/event/ngx_event_openssl.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/event') diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h index 8ad87bbfa..09654dbd3 100644 --- a/src/event/ngx_event_openssl.h +++ b/src/event/ngx_event_openssl.h @@ -39,6 +39,17 @@ #endif +#if (OPENSSL_VERSION_NUMBER >= 0x10100001L) + +#define ngx_ssl_version() OpenSSL_version(OPENSSL_VERSION) + +#else + +#define ngx_ssl_version() SSLeay_version(SSLEAY_VERSION) + +#endif + + #define ngx_ssl_session_t SSL_SESSION #define ngx_ssl_conn_t SSL -- cgit