Merge 22709 - Treat certificate signatures using weak signature algorithms...

net/base/x509_certificate_win.cc

Index: net/base/x509_certificate_win.cc
===================================================================
--- net/base/x509_certificate_win.cc	(revision 23267)
+++ net/base/x509_certificate_win.cc	(working copy)
@@ -471,6 +471,10 @@
   verify_result->cert_status |= MapCertChainErrorStatusToCertStatus(
       chain_context->TrustStatus.dwErrorStatus);
 
+  // Treat certificate signatures using weak signature algorithms as invalid.
+  if (verify_result->has_md2 || verify_result->has_md4)
+    verify_result->cert_status |= CERT_STATUS_INVALID;
+
   std::wstring wstr_hostname = ASCIIToWide(hostname);
 
   SSL_EXTRA_CERT_CHAIN_POLICY_PARA extra_policy_para;
Property changes on: net\base\x509_certificate_win.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/net/base/x509_certificate_win.cc:r22709
   Merged /branches/chrome_webkit_merge_branch/net/base/x509_certificate_win.cc:r69-2775