Hakase/nginx-quic
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Latest update - 9200

Browse Source
This commit is contained in:
Hakase
2023-12-26 10:40:26 +09:00
parent e4eab7b437
commit 6823db169c
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event/ngx_event_openssl.c
+8 -7
View File
@@ -1105,7 +1105,8 @@ ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
BIO *rbio, *wbio; BIO *rbio, *wbio;
ngx_connection_t *c; ngx_connection_t *c;
#ifndef SSL_OP_NO_RENEGOTIATION #if (!defined SSL_OP_NO_RENEGOTIATION \
&& !defined SSL_OP_NO_CLIENT_RENEGOTIATION)
if ((where & SSL_CB_HANDSHAKE_START) if ((where & SSL_CB_HANDSHAKE_START)
&& SSL_is_server((ngx_ssl_conn_t *) ssl_conn)) && SSL_is_server((ngx_ssl_conn_t *) ssl_conn))
@@ -1839,9 +1840,10 @@ ngx_ssl_handshake(ngx_connection_t *c)
c->read->ready = 1; c->read->ready = 1;
c->write->ready = 1; c->write->ready = 1;
#ifndef SSL_OP_NO_RENEGOTIATION #if (!defined SSL_OP_NO_RENEGOTIATION \
#if OPENSSL_VERSION_NUMBER < 0x10100000L && !defined SSL_OP_NO_CLIENT_RENEGOTIATION \
#ifdef SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS && defined SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS \
&& OPENSSL_VERSION_NUMBER < 0x10100000L)
/* initial handshake done, disable renegotiation (CVE-2009-3555) */ /* initial handshake done, disable renegotiation (CVE-2009-3555) */
if (c->ssl->connection->s3 && SSL_is_server(c->ssl->connection)) { if (c->ssl->connection->s3 && SSL_is_server(c->ssl->connection)) {
@@ -1849,8 +1851,6 @@ ngx_ssl_handshake(ngx_connection_t *c)
} }
#endif #endif
#endif
#endif
#if (defined BIO_get_ktls_send && !NGX_WIN32) #if (defined BIO_get_ktls_send && !NGX_WIN32)
@@ -2484,7 +2484,8 @@ ngx_ssl_handle_recv(ngx_connection_t *c, int n)
int sslerr; int sslerr;
ngx_err_t err; ngx_err_t err;
#ifndef SSL_OP_NO_RENEGOTIATION #if (!defined SSL_OP_NO_RENEGOTIATION \
&& !defined SSL_OP_NO_CLIENT_RENEGOTIATION)
if (c->ssl->renegotiation) { if (c->ssl->renegotiation) {
/* /*
src/event/ngx_event_openssl.h
+1 -1
View File
@@ -45,7 +45,7 @@
#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L) #if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L)
#undef OPENSSL_VERSION_NUMBER #undef OPENSSL_VERSION_NUMBER
#if (LIBRESSL_VERSION_NUMBER >= 0x2080000fL) #if (LIBRESSL_VERSION_NUMBER >= 0x3050000fL)
#define OPENSSL_VERSION_NUMBER 0x1010000fL #define OPENSSL_VERSION_NUMBER 0x1010000fL
#else #else
#define OPENSSL_VERSION_NUMBER 0x1000107fL #define OPENSSL_VERSION_NUMBER 0x1000107fL
src/event/ngx_event_openssl_stapling.c
+1 -1
View File
@@ -893,7 +893,7 @@ ngx_ssl_ocsp_validate(ngx_connection_t *c)
ocsp->cert_status = V_OCSP_CERTSTATUS_GOOD; ocsp->cert_status = V_OCSP_CERTSTATUS_GOOD;
ocsp->conf = ocf; ocsp->conf = ocf;
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined LIBRESSL_VERSION_NUMBER) #if OPENSSL_VERSION_NUMBER >= 0x10100000L
ocsp->certs = SSL_get0_verified_chain(c->ssl->connection); ocsp->certs = SSL_get0_verified_chain(c->ssl->connection);
src/os/win32/ngx_win32_config.h
+5 -1
View File
@@ -280,7 +280,11 @@ typedef int sig_atomic_t;
#define NGX_HAVE_GETADDRINFO 1 #define NGX_HAVE_GETADDRINFO 1
#define ngx_random rand #define ngx_random() \
((long) (0x7fffffff & ( ((uint32_t) rand() << 16) \
^ ((uint32_t) rand() << 8) \
^ ((uint32_t) rand()) )))
#define ngx_debug_init() #define ngx_debug_init()