diff options
| author | Piotr Sikora <piotr@cloudflare.com> | 2014-07-30 04:32:16 -0700 |
|---|---|---|
| committer | Piotr Sikora <piotr@cloudflare.com> | 2014-07-30 04:32:16 -0700 |
| commit | 9ed633b9303d3af2980cf49d145459d2ea888ec7 (patch) | |
| tree | 221eb7e493233dcf2a639b09993b09cb345fbad6 | |
| parent | 0dcfca0301d05b3d5d973c5bdcd24acd14bd2a35 (diff) | |
| download | nginx-9ed633b9303d3af2980cf49d145459d2ea888ec7.tar.gz nginx-9ed633b9303d3af2980cf49d145459d2ea888ec7.zip | |
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>
| -rw-r--r-- | src/event/ngx_event_openssl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 7ee77754b..bb82143d3 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -50,7 +50,7 @@ static int ngx_ssl_session_ticket_key_callback(ngx_ssl_conn_t *ssl_conn, 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 @@ ngx_ssl_check_host(ngx_connection_t *c, ngx_str_t *name) 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 @@ found: } -#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) |