diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 17:07:54 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 17:07:54 +0000 |
| commit | 70c851d54b2a0458868f2c7a4abbb510d5ae758e (patch) | |
| tree | 2edb9aedc7f6105084654372e6d897a7700291a6 /net | |
| parent | 7453c6f328a0d9a6468897b9e78a9ea1b58324e9 (diff) | |
| download | chromium_src-70c851d54b2a0458868f2c7a4abbb510d5ae758e.zip chromium_src-70c851d54b2a0458868f2c7a4abbb510d5ae758e.tar.gz chromium_src-70c851d54b2a0458868f2c7a4abbb510d5ae758e.tar.bz2 | |
net: add Baltimore CyberTrust Root to the twitterCDN pinning set.
This was previously an intermediate but has been promoted to a root in some
root stores. This is causing chain truncation and pinning mismatches for, at
least, twimg0-a.akamaihd.net.
BUG=285472
R=cbentzel@chromium.org
Review URL: https://codereview.chromium.org/68113025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/http/transport_security_state_static.certs | 23 | ||||
| -rw-r--r-- | net/http/transport_security_state_static.h | 5 | ||||
| -rw-r--r-- | net/http/transport_security_state_static.json | 3 |
3 files changed, 30 insertions, 1 deletions
diff --git a/net/http/transport_security_state_static.certs b/net/http/transport_security_state_static.certs index 2407696..215e80d 100644 --- a/net/http/transport_security_state_static.certs +++ b/net/http/transport_security_state_static.certs @@ -1021,6 +1021,29 @@ GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9 lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/ -----END CERTIFICATE----- +BaltimoreCyberTrustRoot +-----BEGIN CERTIFICATE----- +MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ +RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD +VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX +DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y +ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy +VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr +mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr +IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK +mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu +XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy +dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye +jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 +BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 +DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 +9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx +jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 +Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz +ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS +R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp +-----END CERTIFICATE----- + Tor2web -----BEGIN CERTIFICATE----- MIIEgjCCA2qgAwIBAgISESHiIwbyj8tbXjvCF3lADzOxMA0GCSqGSIb3DQEBBQUA diff --git a/net/http/transport_security_state_static.h b/net/http/transport_security_state_static.h index b9233f7..9d3b13b 100644 --- a/net/http/transport_security_state_static.h +++ b/net/http/transport_security_state_static.h @@ -194,6 +194,10 @@ static const char kSPKIHash_GTECyberTrustGlobalRoot[] = "\x59\x79\x12\xde\x61\x75\xd6\x6f\xc4\x23" "\xb7\x77\x13\x74\xc7\x96\xde\x6f\x88\x72"; +static const char kSPKIHash_BaltimoreCyberTrustRoot[] = + "\x30\xa4\xe6\x4f\xde\x76\x8a\xfc\xed\x5a" + "\x90\x84\x28\x30\x46\x79\x2c\x29\x15\x70"; + static const char kSPKIHash_Tor2web[] = "\x19\xe5\xb5\x87\x1b\xd4\x83\x2e\xc8\xf5" "\x94\x97\xfe\xc6\x5e\xfb\x48\xe3\x33\xb1"; @@ -320,6 +324,7 @@ static const char* const kTwitterCDNAcceptableCerts[] = { kSPKIHash_UTNUSERFirstHardware, kSPKIHash_UTNUSERFirstObject, kSPKIHash_GTECyberTrustGlobalRoot, + kSPKIHash_BaltimoreCyberTrustRoot, NULL, }; #define kTwitterCDNPins { \ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_security_state_static.json index 02f1531..1dd8c3f 100644 --- a/net/http/transport_security_state_static.json +++ b/net/http/transport_security_state_static.json @@ -125,7 +125,8 @@ "UTNUSERFirstClientAuthenticationandEmail", "UTNUSERFirstHardware", "UTNUSERFirstObject", - "GTECyberTrustGlobalRoot" + "GTECyberTrustGlobalRoot", + "BaltimoreCyberTrustRoot" ] }, { |