diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 22:39:29 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 22:39:29 +0000 |
| commit | 448b3692014b5a6373c132515482346c73996209 (patch) | |
| tree | 3c37887aff98b1b1056ee2fddddcc54b18b2cbbb | |
| parent | 1d3fc66ed2fde54981e46f89a11ce9baaf9a7501 (diff) | |
| download | chromium_src-448b3692014b5a6373c132515482346c73996209.zip chromium_src-448b3692014b5a6373c132515482346c73996209.tar.gz chromium_src-448b3692014b5a6373c132515482346c73996209.tar.bz2 | |
net: block Digicert Sdn. Bhd. on M16.
This won't go out until next week so this patch blocks both intermediate
certificates held by Digicert Sdn. Bhd.
BUG=102530
TEST=Check that https://mmail.esyariah.gov.my fails with a revocation error (until the site updates)
git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108563 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/base/x509_certificate.cc | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/net/base/x509_certificate.cc b/net/base/x509_certificate.cc index 04465ec..ade0951 100644 --- a/net/base/x509_certificate.cc +++ b/net/base/x509_certificate.cc @@ -600,7 +600,7 @@ int X509Certificate::Verify(const std::string& hostname, int flags, // This check is done after VerifyInternal so that VerifyInternal can fill in // the list of public key hashes. if (IsPublicKeyBlacklisted(verify_result->public_key_hashes)) { - verify_result->cert_status |= CERT_STATUS_AUTHORITY_INVALID; + verify_result->cert_status |= CERT_STATUS_REVOKED; rv = MapCertStatusToNetError(verify_result->cert_status); } @@ -964,7 +964,7 @@ bool X509Certificate::IsBlacklisted() const { // static bool X509Certificate::IsPublicKeyBlacklisted( const std::vector<SHA1Fingerprint>& public_key_hashes) { - static const unsigned kNumHashes = 5; + static const unsigned kNumHashes = 7; static const uint8 kHashes[kNumHashes][base::kSHA1Length] = { // Subject: CN=DigiNotar Root CA // Issuer: CN=Entrust.net x2 and self-signed @@ -986,6 +986,16 @@ bool X509Certificate::IsPublicKeyBlacklisted( // Issuer: CN=Staat der Nederlanden Overheid CA {0xe8, 0xf9, 0x12, 0x00, 0xc6, 0x5c, 0xee, 0x16, 0xe0, 0x39, 0xb9, 0xf8, 0x83, 0x84, 0x16, 0x61, 0x63, 0x5f, 0x81, 0xc5}, + // Subject: O=Digicert Sdn. Bhd. + // Issuer: CN=GTE CyberTrust Global Root + // Expires: Jul 17 15:16:54 2012 GMT + {0x01, 0x29, 0xbc, 0xd5, 0xb4, 0x48, 0xae, 0x8d, 0x24, 0x96, + 0xd1, 0xc3, 0xe1, 0x97, 0x23, 0x91, 0x90, 0x88, 0xe1, 0x52}, + // Subject: O=Digicert Sdn. Bhd. + // Issuer: CN=Entrust.net Certification Authority (2048) + // Expires: Jul 16 17:53:37 2015 GMT + {0xd3, 0x3c, 0x5b, 0x41, 0xe4, 0x5c, 0xc4, 0xb3, 0xbe, 0x9a, + 0xd6, 0x95, 0x2c, 0x4e, 0xcc, 0x25, 0x28, 0x03, 0x29, 0x81}, }; for (unsigned i = 0; i < kNumHashes; i++) { |