diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 11:36:37 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 11:36:37 +0000 |
| commit | 2fe8b630617b48ec4590b04dccf70b87db0a84a0 (patch) | |
| tree | 8299aa8c9ffebd0de620e7fe73c3c779ec91bd10 /crypto/hkdf_unittest.cc | |
| parent | cc405e47896d2b031f8f42a93337538e162ab1e4 (diff) | |
| download | chromium_src-2fe8b630617b48ec4590b04dccf70b87db0a84a0.zip chromium_src-2fe8b630617b48ec4590b04dccf70b87db0a84a0.tar.gz chromium_src-2fe8b630617b48ec4590b04dccf70b87db0a84a0.tar.bz2 | |
Implement QUIC key extraction.
Added a new subkey_secret output to crypto::HKDF which is
saved by the forward-secure key derivation and used for a new
ExportKeyingMaterial method on QuicCryptoStream. This will be used
in Chromium for WebRTC on QUIC.
Generated some tests by making a straightforward alternative
implementation in Python.
Written by Daniel Ziegler.
Merge internal CL: 72073257
R=agl@chromium.org,dmziegler@chromium.org
BUG=
Review URL: https://codereview.chromium.org/423333002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286738 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/hkdf_unittest.cc')
| -rw-r--r-- | crypto/hkdf_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/hkdf_unittest.cc b/crypto/hkdf_unittest.cc index dc369d1..bcb19c5 100644 --- a/crypto/hkdf_unittest.cc +++ b/crypto/hkdf_unittest.cc @@ -82,7 +82,7 @@ TEST(HKDFTest, HKDF) { // We set the key_length to the length of the expected output and then take // the result from the first key, which is the client write key. - HKDF hkdf(key, salt, info, expected.size(), 0); + HKDF hkdf(key, salt, info, expected.size(), 0, 0); ASSERT_EQ(expected.size(), hkdf.client_write_key().size()); EXPECT_EQ(0, memcmp(expected.data(), hkdf.client_write_key().data(), |