Commit 1b1b632eed84197863b7cc6a00579968362a700b - nginx

SSL: fixed build with LibreSSL 2.8.0 (ticket #1605). LibreSSL 2.8.0 "added const annotations to many existing APIs from OpenSSL, making interoperability easier for downstream applications". This includes the const change in the SSL_CTX_sess_set_get_cb() callback function (see 9dd43f4ef67e), which breaks compilation. To fix this, added a condition on how we redefine OPENSSL_VERSION_NUMBER when working with LibreSSL (see 382fc7069e3a). With LibreSSL 2.8.0, we now set OPENSSL_VERSION_NUMBER to 0x1010000fL (OpenSSL 1.1.0), so the appropriate conditions in the code will use "const" as it happens with OpenSSL 1.1.0 and later versions. Maxim Dounin 3 years ago

1 changed file(s) with 4 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all

-0

src/event/ngx_event_openssl.h less more

35	35
36	36	#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
37	37	#undef OPENSSL_VERSION_NUMBER
	38	#if (LIBRESSL_VERSION_NUMBER >= 0x2080000fL)
	39	#define OPENSSL_VERSION_NUMBER 0x1010000fL
	40	#else
38	41	#define OPENSSL_VERSION_NUMBER 0x1000107fL
	42	#endif
39	43	#endif
40	44
41	45