moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-25 01:28:51 -05:00
Code Issues Releases Wiki Activity

ngtcp2: move the h3 initing to immediately after the rx key

Browse Source 
To fix a segfault and to better deal with 0-RTT

Assisted-by: Tatsuhiro Tsujikawa
This commit is contained in:
Daniel Stenberg 2019-08-20 08:49:56 +02:00
parent e54affa82c
commit 349c3f5a08
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/vquic/ngtcp2.c
View File

@ -315,6 +315,7 @@ static void set_tls_alert(struct quicsocket *qs, uint8_t alert)
{ {
qs->tls_alert = alert; qs->tls_alert = alert;
} }
static int init_ngh3_conn(struct quicsocket *qs);
static int ssl_on_key(struct quicsocket *qs, static int ssl_on_key(struct quicsocket *qs,
int name, const uint8_t *secret, size_t secretlen) int name, const uint8_t *secret, size_t secretlen)
@ -395,6 +396,10 @@ static int ssl_on_key(struct quicsocket *qs,
ngtcp2_conn_install_rx_keys(qs->qconn, key, keylen, iv, ivlen, ngtcp2_conn_install_rx_keys(qs->qconn, key, keylen, iv, ivlen,
hp, hplen); hp, hplen);
qs->rx_crypto_level = NGTCP2_CRYPTO_LEVEL_APP; qs->rx_crypto_level = NGTCP2_CRYPTO_LEVEL_APP;
if(init_ngh3_conn(qs) != CURLE_OK) {
return NGTCP2_ERR_CALLBACK_FAILURE;
}
break; break;
} }
return 0; return 0;
@ -746,8 +751,6 @@ cb_recv_crypto_data(ngtcp2_conn *tconn, ngtcp2_crypto_level crypto_level,
return quic_read_tls(qs); return quic_read_tls(qs);
} }
static int init_ngh3_conn(struct quicsocket *qs);
static int cb_handshake_completed(ngtcp2_conn *tconn, void *user_data) static int cb_handshake_completed(ngtcp2_conn *tconn, void *user_data)
{ {
struct quicsocket *qs = (struct quicsocket *)user_data; struct quicsocket *qs = (struct quicsocket *)user_data;
@ -755,10 +758,6 @@ static int cb_handshake_completed(ngtcp2_conn *tconn, void *user_data)
qs->tx_crypto_level = NGTCP2_CRYPTO_LEVEL_APP; qs->tx_crypto_level = NGTCP2_CRYPTO_LEVEL_APP;
infof(qs->conn->data, "QUIC handshake is completed\n"); infof(qs->conn->data, "QUIC handshake is completed\n");
if(init_ngh3_conn(qs) != CURLE_OK) {
return NGTCP2_ERR_CALLBACK_FAILURE;
}
return 0; return 0;
} }