diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/quic/p2p/quic_p2p_crypto_config.cc | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/quic/p2p/quic_p2p_crypto_config.cc')
| -rw-r--r-- | chromium/net/quic/p2p/quic_p2p_crypto_config.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/net/quic/p2p/quic_p2p_crypto_config.cc b/chromium/net/quic/p2p/quic_p2p_crypto_config.cc index d30d3c86b39..6f32056255e 100644 --- a/chromium/net/quic/p2p/quic_p2p_crypto_config.cc +++ b/chromium/net/quic/p2p/quic_p2p_crypto_config.cc @@ -30,8 +30,8 @@ bool QuicP2PCryptoConfig::GetNegotiatedParameters( if (!CryptoUtils::DeriveKeys( out_params->forward_secure_premaster_secret, out_params->aead, out_params->client_nonce, out_params->server_nonce, hkdf_input, - perspective, &out_params->forward_secure_crypters, - &out_params->subkey_secret)) { + perspective, CryptoUtils::Diversification::Never(), + &out_params->forward_secure_crypters, &out_params->subkey_secret)) { return false; } |