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_signature_creator_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_signature_creator_unittest.cc')
| -rw-r--r-- | chromium/crypto/ec_signature_creator_unittest.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/chromium/crypto/ec_signature_creator_unittest.cc b/chromium/crypto/ec_signature_creator_unittest.cc index bc0cb4a6b60..2a40cfe0c12 100644 --- a/chromium/crypto/ec_signature_creator_unittest.cc +++ b/chromium/crypto/ec_signature_creator_unittest.cc @@ -12,17 +12,9 @@ #include "crypto/signature_verifier.h" #include "testing/gtest/include/gtest/gtest.h" -#if defined(USE_OPENSSL) -// Once ECSignatureCreator is implemented for OpenSSL, remove this #if block. -// TODO(rch): When that happens, also add some exported keys from each to +// TODO(rch): Add some exported keys from each to // test interop between NSS and OpenSSL. -TEST(ECSignatureCreatorTest, OpenSSLStub) { - scoped_ptr<crypto::ECSignatureCreator> signer( - crypto::ECSignatureCreator::Create(NULL)); - ASSERT_TRUE(signer.get()); - EXPECT_FALSE(signer->Sign(NULL, 0, NULL)); -} -#else + TEST(ECSignatureCreatorTest, BasicTest) { // Do a verify round trip. scoped_ptr<crypto::ECPrivateKey> key_original( @@ -81,4 +73,3 @@ TEST(ECSignatureCreatorTest, BasicTest) { data.size()); ASSERT_TRUE(verifier.VerifyFinal()); } -#endif // !defined(USE_OPENSSL) |