diff options
-rw-r--r-- | base/crypto/signature_verifier_unittest.cc | 9 | ||||
-rw-r--r-- | base/data/purify/base_unittests.exe.gtest.txt | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/base/crypto/signature_verifier_unittest.cc b/base/crypto/signature_verifier_unittest.cc index 3317601..e28395f 100644 --- a/base/crypto/signature_verifier_unittest.cc +++ b/base/crypto/signature_verifier_unittest.cc @@ -238,7 +238,14 @@ TEST(SignatureVerifierTest, BasicTest) { EXPECT_TRUE(ok); verifier.VerifyUpdate(bad_tbs_certificate, sizeof(bad_tbs_certificate)); ok = verifier.VerifyFinal(); + + // Purify disables digital signature verification, causing the Windows + // CryptoAPI function CryptVerifySignature to always succeed. So we can't + // check the signature verification results of the negative tests when + // running inside Purify. See http://crbug.com/10031. +#ifndef PURIFY EXPECT_FALSE(ok); +#endif // Test 4: verify a bad signature. uint8 bad_signature[sizeof(signature)]; @@ -254,6 +261,8 @@ TEST(SignatureVerifierTest, BasicTest) { if (ok) { verifier.VerifyUpdate(tbs_certificate, sizeof(tbs_certificate)); ok = verifier.VerifyFinal(); +#ifndef PURIFY EXPECT_FALSE(ok); +#endif } } diff --git a/base/data/purify/base_unittests.exe.gtest.txt b/base/data/purify/base_unittests.exe.gtest.txt index 61599a2..120916c 100644 --- a/base/data/purify/base_unittests.exe.gtest.txt +++ b/base/data/purify/base_unittests.exe.gtest.txt @@ -25,6 +25,3 @@ ScopedTempDir.* # see issue 7477 ObserverListThreadSafeTest.CrossThreadObserver ObserverListThreadSafeTest.CrossThreadNotifications - -# see bug 10031 -SignatureVerifierTest.BasicTest |