IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Using cached ssl_conn in ngx_quic_handshake_input(), NFC.

Browse Source
This commit is contained in:
Sergey Kandaurov 2020-03-05 12:51:49 +03:00
parent 9fa29e4043
commit 46bd853801
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/event/ngx_event_quic.c
View File

@ -1191,13 +1191,15 @@ static ngx_int_t
ngx_quic_handshake_input(ngx_connection_t *c, ngx_buf_t *bb) ngx_quic_handshake_input(ngx_connection_t *c, ngx_buf_t *bb)
{ {
int sslerr; int sslerr;
u_char *p, *b;
ssize_t n; ssize_t n;
ngx_str_t out; ngx_str_t out;
ngx_ssl_conn_t *ssl_conn;
const EVP_CIPHER *cipher; const EVP_CIPHER *cipher;
ngx_quic_connection_t *qc; ngx_quic_connection_t *qc;
u_char *p, *b;
qc = c->quic; qc = c->quic;
ssl_conn = c->ssl->connection;
n = bb->last - bb->pos; n = bb->last - bb->pos;
p = bb->pos; p = bb->pos;
@ -1302,7 +1304,7 @@ ngx_quic_handshake_input(ngx_connection_t *c, ngx_buf_t *bb)
ngx_quic_hexdump0(c->log, "nonce", nonce, 12); ngx_quic_hexdump0(c->log, "nonce", nonce, 12);
ngx_quic_hexdump0(c->log, "ad", ad.data, ad.len); ngx_quic_hexdump0(c->log, "ad", ad.data, ad.len);
u_char *name = (u_char *) SSL_get_cipher(c->ssl->connection); u_char *name = (u_char *) SSL_get_cipher(ssl_conn);
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0,
"quic ssl cipher: %s", name); "quic ssl cipher: %s", name);
@ -1348,11 +1350,10 @@ ngx_quic_handshake_input(ngx_connection_t *c, ngx_buf_t *bb)
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"SSL_quic_read_level: %d, SSL_quic_write_level: %d", "SSL_quic_read_level: %d, SSL_quic_write_level: %d",
(int) SSL_quic_read_level(c->ssl->connection), (int) SSL_quic_read_level(ssl_conn),
(int) SSL_quic_write_level(c->ssl->connection)); (int) SSL_quic_write_level(ssl_conn));
if (!SSL_provide_quic_data(c->ssl->connection, if (!SSL_provide_quic_data(ssl_conn, SSL_quic_read_level(ssl_conn),
SSL_quic_read_level(c->ssl->connection),
crypto, crypto_len)) crypto, crypto_len))
{ {
ngx_ssl_error(NGX_LOG_INFO, c->log, 0, ngx_ssl_error(NGX_LOG_INFO, c->log, 0,
@ -1360,12 +1361,12 @@ ngx_quic_handshake_input(ngx_connection_t *c, ngx_buf_t *bb)
return NGX_ERROR; return NGX_ERROR;
} }
n = SSL_do_handshake(c->ssl->connection); n = SSL_do_handshake(ssl_conn);
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_do_handshake: %d", n); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_do_handshake: %d", n);
if (n == -1) { if (n == -1) {
sslerr = SSL_get_error(c->ssl->connection, n); sslerr = SSL_get_error(ssl_conn, n);
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_get_error: %d", ngx_log_debug1(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL_get_error: %d",
sslerr); sslerr);
@ -1377,8 +1378,8 @@ ngx_quic_handshake_input(ngx_connection_t *c, ngx_buf_t *bb)
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"SSL_quic_read_level: %d, SSL_quic_write_level: %d", "SSL_quic_read_level: %d, SSL_quic_write_level: %d",
(int) SSL_quic_read_level(c->ssl->connection), (int) SSL_quic_read_level(ssl_conn),
(int) SSL_quic_write_level(c->ssl->connection)); (int) SSL_quic_write_level(ssl_conn));
// ACK Client Finished // ACK Client Finished