diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 18:45:14 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 18:45:14 +0000 |
| commit | 317dbc7c2270bf0510f95e6c5436ff37b81534d4 (patch) | |
| tree | 7178db0df1a42fa41989379892fed0980322f90c | |
| parent | eb4c4d03a20213f03846c3337b2019da1fd92f15 (diff) | |
| download | chromium_src-317dbc7c2270bf0510f95e6c5436ff37b81534d4.zip chromium_src-317dbc7c2270bf0510f95e6c5436ff37b81534d4.tar.gz chromium_src-317dbc7c2270bf0510f95e6c5436ff37b81534d4.tar.bz2 | |
Re-order some ifdefs in CertVerifyProcTest
BUG=none
TEST=net_unittests
Review URL: https://chromiumcodereview.appspot.com/9934004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130424 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/base/cert_verify_proc_unittest.cc | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/net/base/cert_verify_proc_unittest.cc b/net/base/cert_verify_proc_unittest.cc index c276ecb..5799200 100644 --- a/net/base/cert_verify_proc_unittest.cc +++ b/net/base/cert_verify_proc_unittest.cc @@ -129,17 +129,17 @@ TEST_F(CertVerifyProcTest, PaypalNullCertParsing) { CertVerifyResult verify_result; int error = Verify(paypal_null_cert, "www.paypal.com", flags, NULL, &verify_result); -#if defined(USE_OPENSSL) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(USE_NSS) + EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error); +#else // TOOD(bulach): investigate why macosx and win aren't returning // ERR_CERT_INVALID or ERR_CERT_COMMON_NAME_INVALID. EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, error); -#else - EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error); #endif // Either the system crypto library should correctly report a certificate // name mismatch, or our certificate blacklist should cause us to report an // invalid certificate. -#if !defined(OS_MACOSX) && !defined(USE_OPENSSL) +#if defined(USE_NSS) || defined(OS_WIN) EXPECT_TRUE(verify_result.cert_status & (CERT_STATUS_COMMON_NAME_INVALID | CERT_STATUS_INVALID)); #endif @@ -855,7 +855,8 @@ TEST_P(CertVerifyProcWeakDigestTest, Verify) { const WeakDigestTestData kVerifyRootCATestData[] = { { "weak_digest_md5_root.pem", "weak_digest_sha1_intermediate.pem", "weak_digest_sha1_ee.pem", false, false, false, false, false }, -#if !defined(OS_MACOSX) // MD4 is not supported. +#if defined(USE_OPENSSL) || defined(OS_WIN) + // MD4 is not supported by OS X / NSS { "weak_digest_md4_root.pem", "weak_digest_sha1_intermediate.pem", "weak_digest_sha1_ee.pem", false, false, false, false, false }, #endif @@ -869,7 +870,8 @@ INSTANTIATE_TEST_CASE_P(VerifyRoot, CertVerifyProcWeakDigestTest, const WeakDigestTestData kVerifyIntermediateCATestData[] = { { "weak_digest_sha1_root.pem", "weak_digest_md5_intermediate.pem", "weak_digest_sha1_ee.pem", true, false, false, true, false }, -#if !defined(USE_NSS) && !defined(OS_MACOSX) // MD4 is not supported. +#if defined(USE_OPENSSL) || defined(OS_WIN) + // MD4 is not supported by OS X / NSS { "weak_digest_sha1_root.pem", "weak_digest_md4_intermediate.pem", "weak_digest_sha1_ee.pem", false, true, false, false, false }, #endif @@ -885,7 +887,8 @@ INSTANTIATE_TEST_CASE_P(VerifyIntermediate, CertVerifyProcWeakDigestTest, const WeakDigestTestData kVerifyEndEntityTestData[] = { { "weak_digest_sha1_root.pem", "weak_digest_sha1_intermediate.pem", "weak_digest_md5_ee.pem", true, false, false, false, false }, -#if !defined(USE_NSS) && !defined(OS_MACOSX) // MD4 is not supported. +#if defined(USE_OPENSSL) || defined(OS_WIN) + // MD4 is not supported by OS X / NSS { "weak_digest_sha1_root.pem", "weak_digest_sha1_intermediate.pem", "weak_digest_md4_ee.pem", false, true, false, false, false }, #endif @@ -910,7 +913,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(MAYBE_VerifyEndEntity, const WeakDigestTestData kVerifyIncompleteIntermediateTestData[] = { { NULL, "weak_digest_md5_intermediate.pem", "weak_digest_sha1_ee.pem", true, false, false, true, false }, -#if !defined(OS_MACOSX) // MD4 is not supported. +#if defined(USE_OPENSSL) || defined(OS_WIN) + // MD4 is not supported by OS X / NSS { NULL, "weak_digest_md4_intermediate.pem", "weak_digest_sha1_ee.pem", false, true, false, false, false }, #endif @@ -934,7 +938,8 @@ WRAPPED_INSTANTIATE_TEST_CASE_P( const WeakDigestTestData kVerifyIncompleteEETestData[] = { { NULL, "weak_digest_sha1_intermediate.pem", "weak_digest_md5_ee.pem", true, false, false, false, false }, -#if !defined(OS_MACOSX) // MD4 is not supported. +#if defined(USE_OPENSSL) || defined(OS_WIN) + // MD4 is not supported by OS X / NSS { NULL, "weak_digest_sha1_intermediate.pem", "weak_digest_md4_ee.pem", false, true, false, false, false }, #endif @@ -960,7 +965,8 @@ const WeakDigestTestData kVerifyMixedTestData[] = { "weak_digest_md2_ee.pem", true, false, true, true, false }, { "weak_digest_sha1_root.pem", "weak_digest_md2_intermediate.pem", "weak_digest_md5_ee.pem", true, false, true, false, true }, -#if !defined(OS_MACOSX) // MD4 is not supported. +#if defined(USE_OPENSSL) || defined(OS_WIN) + // MD4 is not supported by OS X / NSS { "weak_digest_sha1_root.pem", "weak_digest_md4_intermediate.pem", "weak_digest_md2_ee.pem", false, true, true, false, false }, #endif |