Record when certificates signed with md[2,4,5] are encountered on OS X.

net/base/x509_certificate_unittest.cc

Index: net/base/x509_certificate_unittest.cc
diff --git a/net/base/x509_certificate_unittest.cc b/net/base/x509_certificate_unittest.cc
index 52a69801544b1009f2a84448ff0f9754de0f9e54..69fc0cb18b632f749c0512c65350b5a031636d8c 100644
--- a/net/base/x509_certificate_unittest.cc
+++ b/net/base/x509_certificate_unittest.cc
@@ -1500,8 +1500,8 @@ TEST_P(X509CertificateNameVerifyTest, VerifyHostname) {
 INSTANTIATE_TEST_CASE_P(, X509CertificateNameVerifyTest,
                         testing::ValuesIn(kNameVerifyTestData));
 
-// Not implemented on Mac or OpenSSL - http://crbug.com/101123
-#if defined(USE_NSS) || defined(OS_WIN)
+// Not implemented on OpenSSL - http://crbug.com/101123
+#if defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
 
 struct WeakDigestTestData {
   const char* root_cert_filename;
@@ -1585,8 +1585,10 @@ TEST_P(X509CertificateWeakDigestTest, 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)  // OS X does not support MD4.
   { "weak_digest_md4_root.pem", "weak_digest_sha1_intermediate.pem",
     "weak_digest_sha1_ee.pem", false, false, false, false, false },
+#endif  // !defined(OS_MACOSX)
   { "weak_digest_md2_root.pem", "weak_digest_sha1_intermediate.pem",
     "weak_digest_sha1_ee.pem", false, false, false, false, false },
 };
@@ -1597,10 +1599,11 @@ INSTANTIATE_TEST_CASE_P(VerifyRoot, X509CertificateWeakDigestTest,
 const WeakDigestTestData kVerifyIntermediateCATestData[] = {
   { "weak_digest_sha1_root.pem", "weak_digest_md5_intermediate.pem",
     "weak_digest_sha1_ee.pem", true, false, false, true, false },
-// NSS does not support MD4 and does not enable MD2 by policy.
-#if !defined(USE_NSS)
+#if !defined(USE_NSS) && !defined(OS_MACOSX)  // NSS & OS X don't support MD4.

[wtc, 2011/11/02 00:28:43]

Nit: I suggest that you just say "MD4 is not supported." in
these comments.

MD4 is rarely used and was probably never mentioned in
PKCS #1.  So it's not surprising that Mac doesn't support it.

   { "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)  // NSS disables MD2 by policy.

[wtc, 2011/11/02 00:28:43]

Nit: "by default" may be better than "by policy".  I don't
understand what you meant by "disable by policy".

   { "weak_digest_sha1_root.pem", "weak_digest_md2_intermediate.pem",
     "weak_digest_sha1_ee.pem", false, false, true, false, true },
 #endif
@@ -1612,10 +1615,11 @@ INSTANTIATE_TEST_CASE_P(VerifyIntermediate, X509CertificateWeakDigestTest,
 const WeakDigestTestData kVerifyEndEntityTestData[] = {
   { "weak_digest_sha1_root.pem", "weak_digest_sha1_intermediate.pem",
     "weak_digest_md5_ee.pem", true, false, false, false, false },
-// NSS does not support MD4 and does not enable MD2 by policy.
-#if !defined(USE_NSS)
+#if !defined(USE_NSS) && !defined(OS_MACOSX)  // NSS & OS X don't support MD4.
   { "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)  // NSS disables MD2 by policy.
   { "weak_digest_sha1_root.pem", "weak_digest_sha1_intermediate.pem",
     "weak_digest_md2_ee.pem", false, false, true, false, false },
 #endif
@@ -1636,8 +1640,10 @@ 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)  // OS X does not support MD4.
   { NULL, "weak_digest_md4_intermediate.pem", "weak_digest_sha1_ee.pem",
     false, true, false, false, false },
+#endif
   { NULL, "weak_digest_md2_intermediate.pem", "weak_digest_sha1_ee.pem",
     false, false, true, false, true },
 };
@@ -1660,8 +1666,10 @@ 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)  // OS X does not support MD4.
   { NULL, "weak_digest_sha1_intermediate.pem", "weak_digest_md4_ee.pem",
     false, true, false, false, false },
+#endif
   { NULL, "weak_digest_sha1_intermediate.pem", "weak_digest_md2_ee.pem",
     false, false, true, false, false },
 };
@@ -1684,8 +1692,10 @@ 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)  // OS X does not support MD4.
   { "weak_digest_sha1_root.pem", "weak_digest_md4_intermediate.pem",
     "weak_digest_md2_ee.pem", false, true, true, false, false },
+#endif
 };
 // NSS does not support MD4 and does not enable MD2 by policy, making all
 // permutations invalid.
@@ -1699,6 +1709,6 @@ WRAPPED_INSTANTIATE_TEST_CASE_P(
     X509CertificateWeakDigestTest,
     testing::ValuesIn(kVerifyMixedTestData));
 
-#endif  // defined(USE_NSS) || defined(OS_WIN)
+#endif  // defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)
 
 }  // namespace net