summaryrefslogtreecommitdiffstats
path: root/crypto/crypto.gyp
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-22 19:27:46 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-22 19:27:46 +0000
commit37fa1c5f955074649ec7b9d71a0a805049601530 (patch)
tree332a25a75e4f75f2c0b5827e2d1600cc58469234 /crypto/crypto.gyp
parent1a2a6d5df563a460b78e49da061422f41af77ae3 (diff)
downloadchromium_src-37fa1c5f955074649ec7b9d71a0a805049601530.zip
chromium_src-37fa1c5f955074649ec7b9d71a0a805049601530.tar.gz
chromium_src-37fa1c5f955074649ec7b9d71a0a805049601530.tar.bz2
Revert 184133
It failed in this way: [ RUN ] HKDFTest.HKDFConstruct c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\vector(932) : Assertion failed: vector subscript out of range c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\include\vector(933) : Assertion failed: "Standard C++ Libraries Out of Range" && 0 http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%28dbg%29%281%29/builds/33019/steps/crypto_unittests/logs/stdio > Porting of HKDF changes from server. > > Merge internal CL: 40300624 > > > Review URL: https://chromiumcodereview.appspot.com/12326029 TBR=rtenneti@chromium.org Review URL: https://codereview.chromium.org/12330079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
-rw-r--r--crypto/crypto.gyp3
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index 39e4712..b9742f7f 100644
--- a/crypto/crypto.gyp
+++ b/crypto/crypto.gyp
@@ -200,8 +200,6 @@
'encryptor.h',
'encryptor_nss.cc',
'encryptor_openssl.cc',
- 'hkdf.cc',
- 'hkdf.h',
'hmac_nss.cc',
'hmac_openssl.cc',
'mac_security_services_lock.cc',
@@ -266,7 +264,6 @@
'ec_signature_creator_unittest.cc',
'encryptor_unittest.cc',
'ghash_unittest.cc',
- 'hkdf_unittest.cc',
'hmac_unittest.cc',
'nss_util_unittest.cc',
'p224_unittest.cc',