diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 06:47:22 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 06:47:22 +0000 |
| commit | 48b581d45aa0947e81ddf73891435ff7d8147bd1 (patch) | |
| tree | 1ad1f96b530179b2fb267ab6e54658f6f80cc77b /crypto/crypto.gyp | |
| parent | 8bdcb66b26ef17e0f847130305eea13531f0bee3 (diff) | |
| download | chromium_src-48b581d45aa0947e81ddf73891435ff7d8147bd1.zip chromium_src-48b581d45aa0947e81ddf73891435ff7d8147bd1.tar.gz chromium_src-48b581d45aa0947e81ddf73891435ff7d8147bd1.tar.bz2 | |
Relanding Porting of HKDF changes from server.
Added a2b_hex function to move common code in hkdf_unittest.cc
and to make it similar to CL - 40300624.
Merge internal CL: 40300624
Original approved CL: https://chromiumcodereview.appspot.com/12326029/
R=agl@chromium.org, rsleevi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12335045
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index b9742f7f..39e4712 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -200,6 +200,8 @@ 'encryptor.h', 'encryptor_nss.cc', 'encryptor_openssl.cc', + 'hkdf.cc', + 'hkdf.h', 'hmac_nss.cc', 'hmac_openssl.cc', 'mac_security_services_lock.cc', @@ -264,6 +266,7 @@ 'ec_signature_creator_unittest.cc', 'encryptor_unittest.cc', 'ghash_unittest.cc', + 'hkdf_unittest.cc', 'hmac_unittest.cc', 'nss_util_unittest.cc', 'p224_unittest.cc', |