diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/crypto/ec_private_key_unittest.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/crypto/ec_private_key_unittest.cc')
| -rw-r--r-- | chromium/crypto/ec_private_key_unittest.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/chromium/crypto/ec_private_key_unittest.cc b/chromium/crypto/ec_private_key_unittest.cc index d2ec256deda..d1a4c862fcb 100644 --- a/chromium/crypto/ec_private_key_unittest.cc +++ b/chromium/crypto/ec_private_key_unittest.cc @@ -9,16 +9,9 @@ #include "base/memory/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" -#if defined(USE_OPENSSL) -// Once ECPrivateKey is implemented for OpenSSL, remove this #if block. -// TODO(mattm): When that happens, also add some exported keys from each to test +// TODO(mattm): Add some exported keys from each to test // interop between NSS and OpenSSL. -TEST(ECPrivateKeyUnitTest, OpenSSLStub) { - scoped_ptr<crypto::ECPrivateKey> keypair1( - crypto::ECPrivateKey::Create()); - ASSERT_FALSE(keypair1.get()); -} -#else + // Generate random private keys. Export, then re-import. We should get // back the same exact public key, and the private key should have the same // value and elliptic curve params. @@ -104,4 +97,3 @@ TEST(ECPrivateKeyUnitTest, BadPasswordTest) { password2, privkey1, pubkey1)); ASSERT_FALSE(keypair2.get()); } -#endif // !defined(USE_OPENSSL) |