Mercurial > hg > nginx
changeset 5779:e0eaf2d92a8c
SSL: let it build against LibreSSL.
LibreSSL developers decided that LibreSSL is OpenSSL-2.0.0, so tests
for OpenSSL-1.0.2+ are now passing, even though the library doesn't
provide functions that are expected from that version of OpenSSL.
Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
author | Piotr Sikora <piotr@cloudflare.com> |
---|---|
date | Wed, 30 Jul 2014 04:32:16 -0700 |
parents | 45ed2f1f0a6a |
children | f1e05e533c8b |
files | src/event/ngx_event_openssl.c |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_openssl.c Wed Jul 30 04:32:15 2014 -0700 +++ b/src/event/ngx_event_openssl.c Wed Jul 30 04:32:16 2014 -0700 @@ -50,7 +50,7 @@ HMAC_CTX *hctx, int enc); #endif -#if OPENSSL_VERSION_NUMBER < 0x10002002L +#if (OPENSSL_VERSION_NUMBER < 0x10002002L || defined LIBRESSL_VERSION_NUMBER) static ngx_int_t ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *str); #endif @@ -2743,7 +2743,7 @@ return NGX_ERROR; } -#if OPENSSL_VERSION_NUMBER >= 0x10002002L +#if (OPENSSL_VERSION_NUMBER >= 0x10002002L && !defined LIBRESSL_VERSION_NUMBER) /* X509_check_host() is only available in OpenSSL 1.0.2+ */ @@ -2860,7 +2860,7 @@ } -#if OPENSSL_VERSION_NUMBER < 0x10002002L +#if (OPENSSL_VERSION_NUMBER < 0x10002002L || defined LIBRESSL_VERSION_NUMBER) static ngx_int_t ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *pattern)