| Index: net/base/cert_verify_proc_unittest.cc
|
| diff --git a/net/base/cert_verify_proc_unittest.cc b/net/base/cert_verify_proc_unittest.cc
|
| index 2638dec3d9d9be58c5e5852724befa92c6238400..8c83ec176911b7ed4236fc1c479e68210d1bfe08 100644
|
| --- a/net/base/cert_verify_proc_unittest.cc
|
| +++ b/net/base/cert_verify_proc_unittest.cc
|
| @@ -23,7 +23,7 @@
|
|
|
| #if defined(OS_WIN)
|
| #include "base/win/windows_version.h"
|
| -#elif defined(OS_MACOSX)
|
| +#elif defined(OS_MACOSX) && !defined(OS_IOS)
|
| #include "base/mac/mac_util.h"
|
| #endif
|
|
|
| @@ -130,7 +130,7 @@ TEST_F(CertVerifyProcTest, PaypalNullCertParsing) {
|
| CertVerifyResult verify_result;
|
| int error = Verify(paypal_null_cert, "www.paypal.com", flags, NULL,
|
| &verify_result);
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS) || defined(OS_IOS)
|
| EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error);
|
| #else
|
| // TOOD(bulach): investigate why macosx and win aren't returning
|
| @@ -140,7 +140,7 @@ TEST_F(CertVerifyProcTest, PaypalNullCertParsing) {
|
| // 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(USE_NSS) || defined(OS_WIN)
|
| +#if defined(USE_NSS) || defined(OS_WIN) || defined(OS_IOS)
|
| EXPECT_TRUE(verify_result.cert_status &
|
| (CERT_STATUS_COMMON_NAME_INVALID | CERT_STATUS_INVALID));
|
| #endif
|
| @@ -512,7 +512,7 @@ TEST_F(CertVerifyProcTest, InvalidKeyUsage) {
|
| #endif
|
| // TODO(wtc): fix http://crbug.com/75520 to get all the certificate errors
|
| // from NSS.
|
| -#if !defined(USE_NSS)
|
| +#if !defined(USE_NSS) && !defined(OS_IOS)
|
| // The certificate is issued by an unknown CA.
|
| EXPECT_TRUE(verify_result.cert_status & CERT_STATUS_AUTHORITY_INVALID);
|
| #endif
|
| @@ -655,7 +655,7 @@ TEST_F(CertVerifyProcTest, VerifyReturnChainFiltersUnrelatedCerts) {
|
| certs[2]->os_cert_handle()));
|
| }
|
|
|
| -#if defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
|
| +#if defined(USE_NSS) || defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX)
|
| static const uint8 kCRLSetThawteSPKIBlocked[] = {
|
| 0x8e, 0x00, 0x7b, 0x22, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x3a,
|
| 0x30, 0x2c, 0x22, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70,
|
| @@ -889,7 +889,7 @@ 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) // MD2 is disabled by default.
|
| +#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
|
| @@ -906,7 +906,7 @@ 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) // MD2 is disabled by default.
|
| +#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
|
| @@ -914,7 +914,7 @@ const WeakDigestTestData kVerifyEndEntityTestData[] = {
|
| // 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
|
| // in Chromium.
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS) || defined(OS_IOS)
|
| #define MAYBE_VerifyEndEntity DISABLED_VerifyEndEntity
|
| #else
|
| #define MAYBE_VerifyEndEntity VerifyEndEntity
|
| @@ -937,7 +937,7 @@ const WeakDigestTestData kVerifyIncompleteIntermediateTestData[] = {
|
| };
|
| // Disabled on NSS - libpkix does not return constructed chains on error,
|
| // preventing us from detecting/inspecting the verified chain.
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS) || defined(OS_IOS)
|
| #define MAYBE_VerifyIncompleteIntermediate \
|
| DISABLED_VerifyIncompleteIntermediate
|
| #else
|
| @@ -962,7 +962,7 @@ const WeakDigestTestData kVerifyIncompleteEETestData[] = {
|
| };
|
| // Disabled on NSS - libpkix does not return constructed chains on error,
|
| // preventing us from detecting/inspecting the verified chain.
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS) || defined(OS_IOS)
|
| #define MAYBE_VerifyIncompleteEndEntity DISABLED_VerifyIncompleteEndEntity
|
| #else
|
| #define MAYBE_VerifyIncompleteEndEntity VerifyIncompleteEndEntity
|
| @@ -987,7 +987,7 @@ const WeakDigestTestData kVerifyMixedTestData[] = {
|
| };
|
| // NSS does not support MD4 and does not enable MD2 by default, making all
|
| // permutations invalid.
|
| -#if defined(USE_NSS)
|
| +#if defined(USE_NSS) || defined(OS_IOS)
|
| #define MAYBE_VerifyMixed DISABLED_VerifyMixed
|
| #else
|
| #define MAYBE_VerifyMixed VerifyMixed
|
|
|