Mercurial > hg > nginx
comparison src/core/nginx.c @ 6492:3b77efe05b92
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 31 Mar 2016 23:38:38 +0300 |
parents | f01ab2dbcfdc |
children | c045b4926b2c |
comparison
equal
deleted
inserted
replaced
6491:45f2385a47e6 | 6492:3b77efe05b92 |
---|---|
411 #ifdef NGX_COMPILER | 411 #ifdef NGX_COMPILER |
412 ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED); | 412 ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED); |
413 #endif | 413 #endif |
414 | 414 |
415 #if (NGX_SSL) | 415 #if (NGX_SSL) |
416 if (SSLeay() == SSLEAY_VERSION_NUMBER) { | 416 if (ngx_strcmp(ngx_ssl_version(), OPENSSL_VERSION_TEXT) == 0) { |
417 ngx_write_stderr("built with " OPENSSL_VERSION_TEXT NGX_LINEFEED); | 417 ngx_write_stderr("built with " OPENSSL_VERSION_TEXT NGX_LINEFEED); |
418 } else { | 418 } else { |
419 ngx_write_stderr("built with " OPENSSL_VERSION_TEXT | 419 ngx_write_stderr("built with " OPENSSL_VERSION_TEXT |
420 " (running with "); | 420 " (running with "); |
421 ngx_write_stderr((char *) (uintptr_t) | 421 ngx_write_stderr((char *) (uintptr_t) ngx_ssl_version()); |
422 SSLeay_version(SSLEAY_VERSION)); | |
423 ngx_write_stderr(")" NGX_LINEFEED); | 422 ngx_write_stderr(")" NGX_LINEFEED); |
424 } | 423 } |
425 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME | 424 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME |
426 ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED); | 425 ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED); |
427 #else | 426 #else |