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

QUIC: relocated ngx_quic_init_streams() for 0-RTT. 

Previously, streams were initialized in early keys handler.  However, client
transport parameters may not be available by then.  This happens, for example,
when using QuicTLS.  Now streams are initialized in ngx_quic_crypto_input()
after calling SSL_do_handshake() for both 0-RTT and 1-RTT.
This commit is contained in:
Roman Arutyunyan 2023-01-10 17:24:10 +04:00
parent 1565a79f8a
commit 994f4ef06c
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/event/quic/ngx_event_quic_ssl.c
View File

@ -67,12 +67,6 @@ ngx_quic_set_read_secret(ngx_ssl_conn_t *ssl_conn,
return 0;
}
if (level == ssl_encryption_early_data) {
if (ngx_quic_init_streams(c) != NGX_OK) {
return 0;
}
}
return 1;
}
@ -138,10 +132,6 @@ ngx_quic_set_encryption_secrets(ngx_ssl_conn_t *ssl_conn,
}
if (level == ssl_encryption_early_data) {
if (ngx_quic_init_streams(c) != NGX_OK) {
return 0;
}
return 1;
}
@ -455,11 +445,17 @@ ngx_quic_crypto_input(ngx_connection_t *c, ngx_chain_t *data)
qc->error_reason = "handshake failed";
return NGX_ERROR;
}
return NGX_OK;
}
if (SSL_in_init(ssl_conn)) {
if (n <= 0 || SSL_in_init(ssl_conn)) {
if (ngx_quic_keys_available(qc->keys, ssl_encryption_early_data)
&& qc->client_tp_done)
{
if (ngx_quic_init_streams(c) != NGX_OK) {
return NGX_ERROR;
}
}
return NGX_OK;
}