diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 07:58:44 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 07:58:44 +0000 |
| commit | fa2d3dca03141bd815f2bbdab5733ba72d9fd28c (patch) | |
| tree | 9e7f3976d782db8cea64d9ec3d00acab8ccb0422 /net/base | |
| parent | 944b6984bf84233ba9fbbaf781bb0455611ce90b (diff) | |
| download | chromium_src-fa2d3dca03141bd815f2bbdab5733ba72d9fd28c.zip chromium_src-fa2d3dca03141bd815f2bbdab5733ba72d9fd28c.tar.gz chromium_src-fa2d3dca03141bd815f2bbdab5733ba72d9fd28c.tar.bz2 | |
Disable MD5 certificate signatures if NSS is used to verify certificates.
This prepares us for NSS 3.14, which disables MD5 certificate signatures
by default.
Disable a unit test for NSS because all the test cases in that test are
invalid now.
R=rsleevi@chromium.org
BUG=151692
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11365274
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/cert_verify_proc_unittest.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/net/base/cert_verify_proc_unittest.cc b/net/base/cert_verify_proc_unittest.cc index 1a33182..9a03123f 100644 --- a/net/base/cert_verify_proc_unittest.cc +++ b/net/base/cert_verify_proc_unittest.cc @@ -890,13 +890,19 @@ const WeakDigestTestData kVerifyIntermediateCATestData[] = { { "weak_digest_sha1_root.pem", "weak_digest_md4_intermediate.pem", "weak_digest_sha1_ee.pem", false, true, false, false, false }, #endif -#if !defined(USE_NSS) && !defined(OS_IOS) // MD2 is disabled by default. { "weak_digest_sha1_root.pem", "weak_digest_md2_intermediate.pem", "weak_digest_sha1_ee.pem", false, false, true, false, true }, -#endif }; -INSTANTIATE_TEST_CASE_P(VerifyIntermediate, CertVerifyProcWeakDigestTest, - testing::ValuesIn(kVerifyIntermediateCATestData)); +// Disabled on NSS - MD4 is not supported, and MD2 and MD5 are disabled. +#if defined(USE_NSS) || defined(OS_IOS) +#define MAYBE_VerifyIntermediate DISABLED_VerifyIntermediate +#else +#define MAYBE_VerifyIntermediate VerifyIntermediate +#endif +WRAPPED_INSTANTIATE_TEST_CASE_P( + MAYBE_VerifyIntermediate, + CertVerifyProcWeakDigestTest, + testing::ValuesIn(kVerifyIntermediateCATestData)); // The signature algorithm of end-entity should be properly detected. const WeakDigestTestData kVerifyEndEntityTestData[] = { @@ -907,10 +913,8 @@ const WeakDigestTestData kVerifyEndEntityTestData[] = { { "weak_digest_sha1_root.pem", "weak_digest_sha1_intermediate.pem", "weak_digest_md4_ee.pem", false, true, false, false, false }, #endif -#if !defined(USE_NSS) && !defined(OS_IOS) // MD2 is disabled by default. { "weak_digest_sha1_root.pem", "weak_digest_sha1_intermediate.pem", "weak_digest_md2_ee.pem", false, false, true, false, false }, -#endif }; // Disabled on NSS - NSS caches chains/signatures in such a way that cannot // be cleared until NSS is cleanly shutdown, which is not presently supported |