walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix compile error with the latest ngtcp2

This commit is contained in:
Tatsuhiro Tsujikawa 2020-04-02 17:44:41 +09:00
parent 799f72b078
commit a4dc6cf526
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/h2load_quic.cc
View File

@ -476,7 +476,7 @@ int Client::quic_setup_initial_crypto() {
if (ngtcp2_crypto_derive_and_install_initial_key( if (ngtcp2_crypto_derive_and_install_initial_key(
quic.conn, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, quic.conn, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
nullptr, nullptr, nullptr, dcid, NGTCP2_CRYPTO_SIDE_CLIENT) != 0) { nullptr, nullptr, nullptr, dcid) != 0) {
std::cerr << "ngtcp2_crypto_derive_and_install_initial_key() failed" std::cerr << "ngtcp2_crypto_derive_and_install_initial_key() failed"
<< std::endl; << std::endl;
return -1; return -1;
@ -487,11 +487,20 @@ int Client::quic_setup_initial_crypto() {
int Client::quic_on_key(ngtcp2_crypto_level level, const uint8_t *rx_secret, int Client::quic_on_key(ngtcp2_crypto_level level, const uint8_t *rx_secret,
const uint8_t *tx_secret, size_t secretlen) { const uint8_t *tx_secret, size_t secretlen) {
if (ngtcp2_crypto_derive_and_install_key( if (level != NGTCP2_CRYPTO_LEVEL_EARLY &&
quic.conn, ssl, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, ngtcp2_crypto_derive_and_install_rx_key(quic.conn, ssl, nullptr, nullptr,
level, rx_secret, tx_secret, secretlen, nullptr, level, rx_secret,
NGTCP2_CRYPTO_SIDE_CLIENT) != 0) { secretlen) != 0) {
std::cerr << "ngtcp2_crypto_derive_and_install_key() failed" << std::endl; std::cerr << "ngtcp2_crypto_derive_and_install_rx_key() failed"
<< std::endl;
return -1;
}
if (ngtcp2_crypto_derive_and_install_tx_key(quic.conn, ssl, nullptr, nullptr,
nullptr, level, tx_secret,
secretlen) != 0) {
std::cerr << "ngtcp2_crypto_derive_and_install_tx_key() failed"
<< std::endl;
return -1; return -1;
} }