luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ngtcp2: update to git master for the key installation API change

Browse Source 
This updates the ngtcp2 OpenSSL backend to follow the API change in
commit 32e703164 of ngtcp2.

Notable changes are:
- ngtcp2_crypto_derive_and_install_{rx,tx}_key have been added to replace
  ngtcp2_crypto_derive_and_install_key
- the 'side' argument of ngtcp2_crypto_derive_and_install_initial_key
  has been removed

Fixes #5166
Closes #5168
This commit is contained in:
Daiki Ueno 2020-03-29 14:53:39 +02:00 committed by Daniel Stenberg
parent 69d5d183de
commit 8efd26afbf
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/vquic/ngtcp2.c
View File

@ -123,8 +123,8 @@ static int setup_initial_crypto_context(struct quicsocket *qs)
const ngtcp2_cid *dcid = ngtcp2_conn_get_dcid(qs->qconn);
if(ngtcp2_crypto_derive_and_install_initial_key(
qs->qconn, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, dcid,
NGTCP2_CRYPTO_SIDE_CLIENT) != 0)
qs->qconn, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
dcid) != 0)
return -1;
return 0;
@ -169,9 +169,13 @@ static int quic_set_encryption_secrets(SSL *ssl,
struct quicsocket *qs = (struct quicsocket *)SSL_get_app_data(ssl);
int level = quic_from_ossl_level(ossl_level);
if(ngtcp2_crypto_derive_and_install_key(
qs->qconn, ssl, NULL, NULL, NULL, NULL, NULL, NULL, level, rx_secret,
tx_secret, secretlen, NGTCP2_CRYPTO_SIDE_CLIENT) != 0)
if(level != NGTCP2_CRYPTO_LEVEL_EARLY &&
ngtcp2_crypto_derive_and_install_rx_key(
qs->qconn, ssl, NULL, NULL, NULL, level, rx_secret, secretlen) != 0)
return 0;
if(ngtcp2_crypto_derive_and_install_tx_key(
qs->qconn, ssl, NULL, NULL, NULL, level, tx_secret, secretlen) != 0)
return 0;
if(level == NGTCP2_CRYPTO_LEVEL_APP) {