Index: net/quic/crypto/quic_crypto_client_config.cc |
diff --git a/net/quic/crypto/quic_crypto_client_config.cc b/net/quic/crypto/quic_crypto_client_config.cc |
index 49ce8a9bc9c962e99f02ade282cbd088da3536b5..28aa2129afe37b66a323b5d2f58723c66b8efd1f 100644 |
--- a/net/quic/crypto/quic_crypto_client_config.cc |
+++ b/net/quic/crypto/quic_crypto_client_config.cc |
@@ -512,7 +512,8 @@ QuicErrorCode QuicCryptoClientConfig::FillClientHello( |
if (!CryptoUtils::DeriveKeys(out_params->initial_premaster_secret, |
out_params->aead, out_params->client_nonce, |
out_params->server_nonce, hkdf_input, |
- CryptoUtils::CLIENT, &crypters)) { |
+ CryptoUtils::CLIENT, &crypters, |
+ NULL /* subkey secret */)) { |
*error_details = "Symmetric key setup failed"; |
return QUIC_CRYPTO_SYMMETRIC_KEY_SETUP_FAILED; |
} |
@@ -554,7 +555,8 @@ QuicErrorCode QuicCryptoClientConfig::FillClientHello( |
if (!CryptoUtils::DeriveKeys( |
out_params->initial_premaster_secret, out_params->aead, |
out_params->client_nonce, out_params->server_nonce, hkdf_input, |
- CryptoUtils::CLIENT, &out_params->initial_crypters)) { |
+ CryptoUtils::CLIENT, &out_params->initial_crypters, |
+ NULL /* subkey secret */)) { |
*error_details = "Symmetric key setup failed"; |
return QUIC_CRYPTO_SYMMETRIC_KEY_SETUP_FAILED; |
} |
@@ -734,7 +736,8 @@ QuicErrorCode QuicCryptoClientConfig::ProcessServerHello( |
if (!CryptoUtils::DeriveKeys( |
out_params->forward_secure_premaster_secret, out_params->aead, |
out_params->client_nonce, out_params->server_nonce, hkdf_input, |
- CryptoUtils::CLIENT, &out_params->forward_secure_crypters)) { |
+ CryptoUtils::CLIENT, &out_params->forward_secure_crypters, |
+ &out_params->subkey_secret)) { |
*error_details = "Symmetric key setup failed"; |
return QUIC_CRYPTO_SYMMETRIC_KEY_SETUP_FAILED; |
} |