Merge 98741 to 782: Mark DigiNotar as untrusted

net/base/x509_certificate.h

Index: net/base/x509_certificate.h
diff --git a/net/base/x509_certificate.h b/net/base/x509_certificate.h
index a3ad88b85a60c4c02305a021edfa4cae4a03f094..65cbdf0dfdd3bc64da7667d832b7f55e62f1bdd8 100644
--- a/net/base/x509_certificate.h
+++ b/net/base/x509_certificate.h
@@ -404,6 +404,11 @@ class NET_API X509Certificate
   // IsBlacklisted returns true if this certificate is explicitly blacklisted.
   bool IsBlacklisted() const;
 
+  // IsPublicKeyBlacklisted returns true iff one of |public_key_hashes| (which
+  // are SHA1 hashes of SubjectPublicKeyInfo structures) is explicitly blocked.
+  static bool IsPublicKeyBlacklisted(
+      const std::vector<SHA1Fingerprint>& public_key_hashes);
+
   // IsSHA1HashInSortedArray returns true iff |hash| is in |array|, a sorted
   // array of SHA1 hashes.
   static bool IsSHA1HashInSortedArray(const SHA1Fingerprint& hash,