ludra/nginx-build
1
0 Fork 0
forked from Hakase/nginx-build
Code Issues Pull Requests Releases Wiki Activity

Reapply nginx strict sni patch.

Browse Source 
Issue: https://github.com/hakasenyang/nginx-build/commit/e3932ebe24b3fc723d6cb041c52ae63876154df9#commitcomment-30796507
This commit is contained in:
Hakase
2018-10-06 23:08:43 +09:00
parent 3ebb1c0f0c
commit 052f5776dc
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/openssl
+1 -1
Submodule lib/openssl updated: 0148f33165...aa5d30d379
src/event/ngx_event_openssl.c
+16
View File
@@ -1460,6 +1460,14 @@ ngx_ssl_handshake(ngx_connection_t *c)
c->read->error = 1; c->read->error = 1;
// nginx strict sni patch.
// https://github.com/hakasenyang/openssl-patch/issues/1#issuecomment-427040319
if (sslerr == SSL_ERROR_SSL) {
ERR_peek_error();
ERR_clear_error();
return NGX_ERROR;
}
ngx_ssl_connection_error(c, sslerr, err, "SSL_do_handshake() failed"); ngx_ssl_connection_error(c, sslerr, err, "SSL_do_handshake() failed");
return NGX_ERROR; return NGX_ERROR;
@@ -1573,6 +1581,14 @@ ngx_ssl_try_early_data(ngx_connection_t *c)
c->read->error = 1; c->read->error = 1;
// Fixed SSL_read_early_data error.
// https://github.com/hakasenyang/nginx-build/commit/e3932ebe24b3fc723d6cb041c52ae63876154df9#commitcomment-30796507
if (sslerr == SSL_ERROR_SSL) {
ERR_peek_error();
ERR_clear_error();
return NGX_ERROR;
}
ngx_ssl_connection_error(c, sslerr, err, "SSL_read_early_data() failed"); ngx_ssl_connection_error(c, sslerr, err, "SSL_read_early_data() failed");
return NGX_ERROR; return NGX_ERROR;