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

Fix compile error

This commit is contained in:
Tatsuhiro Tsujikawa 2019-12-28 10:09:17 +09:00
parent a995580913
commit 5ce081ce95
3 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/h2load.h
View File

@ -332,8 +332,6 @@ struct Client {
std::array<Crypto, 2> crypto; std::array<Crypto, 2> crypto;
size_t max_pktlen; size_t max_pktlen;
bool close_requested; bool close_requested;
std::vector<uint8_t> rx_secret;
std::vector<uint8_t> tx_secret;
} quic; } quic;
ev_timer request_timeout_watcher; ev_timer request_timeout_watcher;
addrinfo *next_addr; addrinfo *next_addr;

37
src/h2load_quic.cc
View File

@ -226,38 +226,6 @@ int get_new_connection_id(ngtcp2_conn *conn, ngtcp2_cid *cid, uint8_t *token,
} }
} // namespace } // namespace
namespace {
int update_key(ngtcp2_conn *conn, uint8_t *rx_key, uint8_t *rx_iv,
uint8_t *tx_key, uint8_t *tx_iv, void *user_data) {
auto c = static_cast<Client *>(user_data);
if (c->quic_update_key(rx_key, rx_iv, tx_key, tx_iv) != 0) {
return NGTCP2_ERR_CALLBACK_FAILURE;
}
return 0;
}
} // namespace
int Client::quic_update_key(uint8_t *rx_key, uint8_t *rx_iv, uint8_t *tx_key,
uint8_t *tx_iv) {
std::array<uint8_t, 64> rx_secret, tx_secret;
if (ngtcp2_crypto_update_key(quic.conn, rx_secret.data(), tx_secret.data(),
rx_key, rx_iv, tx_key, tx_iv,
quic.rx_secret.data(), quic.tx_secret.data(),
quic.rx_secret.size()) != 0) {
return -1;
}
quic.rx_secret.assign(std::begin(rx_secret),
std::begin(rx_secret) + quic.rx_secret.size());
quic.tx_secret.assign(std::begin(tx_secret),
std::begin(tx_secret) + quic.tx_secret.size());
return 0;
}
namespace { namespace {
void debug_log_printf(void *user_data, const char *fmt, ...) { void debug_log_printf(void *user_data, const char *fmt, ...) {
va_list ap; va_list ap;
@ -398,7 +366,7 @@ int Client::quic_init(const sockaddr *local_addr, socklen_t local_addrlen,
nullptr, // rand nullptr, // rand
get_new_connection_id, get_new_connection_id,
nullptr, // remove_connection_id nullptr, // remove_connection_id
update_key, ngtcp2_crypto_update_key_cb,
nullptr, // path_validation nullptr, // path_validation
select_preferred_addr, select_preferred_addr,
h2load::stream_reset, h2load::stream_reset,
@ -533,9 +501,6 @@ int Client::quic_on_key(ngtcp2_crypto_level level, const uint8_t *rx_secret,
return -1; return -1;
} }
session = std::move(s); session = std::move(s);
quic.rx_secret.assign(rx_secret, rx_secret + secretlen);
quic.tx_secret.assign(tx_secret, tx_secret + secretlen);
} }
return 0; return 0;

2
third-party/neverbleed vendored

@ -1 +1 @@
Subproject commit b967ca054f48a36f82d8fcdd32e54ec5144f2751 Subproject commit 5cf5da80b715223d2614374aec40f2663dc68d6a