| Index: net/cert/cert_verify_proc_unittest.cc
|
| diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc
|
| index d5ccf60b52a9e63fcd174c654d87161ab471e407..e7e297c0d27b335e70dbb352078f0fd75bb0f913 100644
|
| --- a/net/cert/cert_verify_proc_unittest.cc
|
| +++ b/net/cert/cert_verify_proc_unittest.cc
|
| @@ -1776,7 +1776,7 @@ const WeakDigestTestData kVerifyIntermediateCATestData[] = {
|
| "weak_digest_sha1_ee.pem", EXPECT_MD2 | EXPECT_SHA1 | EXPECT_SHA1_LEAF},
|
| };
|
| // Disabled on NSS - MD4 is not supported, and MD2 and MD5 are disabled.
|
| -#if defined(USE_NSS_CERTS) || defined(OS_IOS)
|
| +#if defined(USE_NSS_CERTS)
|
| #define MAYBE_VerifyIntermediate DISABLED_VerifyIntermediate
|
| #else
|
| #define MAYBE_VerifyIntermediate VerifyIntermediate
|
| @@ -1801,7 +1801,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_CERTS) || defined(OS_IOS)
|
| +#if defined(USE_NSS_CERTS)
|
| #define MAYBE_VerifyEndEntity DISABLED_VerifyEndEntity
|
| #else
|
| #define MAYBE_VerifyEndEntity VerifyEndEntity
|
| @@ -1824,7 +1824,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_CERTS) || defined(OS_IOS)
|
| +#if defined(USE_NSS_CERTS)
|
| #define MAYBE_VerifyIncompleteIntermediate \
|
| DISABLED_VerifyIncompleteIntermediate
|
| #else
|
| @@ -1849,7 +1849,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_CERTS) || defined(OS_IOS)
|
| +#if defined(USE_NSS_CERTS)
|
| #define MAYBE_VerifyIncompleteEndEntity DISABLED_VerifyIncompleteEndEntity
|
| #else
|
| #define MAYBE_VerifyIncompleteEndEntity VerifyIncompleteEndEntity
|
| @@ -1874,7 +1874,7 @@ const WeakDigestTestData kVerifyMixedTestData[] = {
|
| };
|
| // NSS does not support MD4 and does not enable MD2 by default, making all
|
| // permutations invalid.
|
| -#if defined(USE_NSS_CERTS) || defined(OS_IOS)
|
| +#if defined(USE_NSS_CERTS)
|
| #define MAYBE_VerifyMixed DISABLED_VerifyMixed
|
| #else
|
| #define MAYBE_VerifyMixed VerifyMixed
|
|
|