Skip to content

Commit

Permalink
SSL: use X509_check_host() with LibreSSL.
Browse files Browse the repository at this point in the history
Explicit checks for OPENSSL_VERSION_NUMBER replaced with checks
for X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT, thus allowing X509_check_host()
to be used with other libraries.  In particular, X509_check_host() was
introduced in LibreSSL 2.5.0.
  • Loading branch information
mdounin committed Oct 4, 2016
1 parent 2c84f7a commit 3c44339
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/event/ngx_event_openssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,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
#ifndef X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT
static ngx_int_t ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *str);
#endif

Expand Down Expand Up @@ -3092,7 +3092,7 @@ ngx_ssl_check_host(ngx_connection_t *c, ngx_str_t *name)
return NGX_ERROR;
}

#if OPENSSL_VERSION_NUMBER >= 0x10002002L
#ifdef X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT

/* X509_check_host() is only available in OpenSSL 1.0.2+ */

Expand Down Expand Up @@ -3209,7 +3209,7 @@ ngx_ssl_check_host(ngx_connection_t *c, ngx_str_t *name)
}


#if OPENSSL_VERSION_NUMBER < 0x10002002L
#ifndef X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT

static ngx_int_t
ngx_ssl_check_name(ngx_str_t *name, ASN1_STRING *pattern)
Expand Down

0 comments on commit 3c44339

Please sign in to comment.