diff options
author | Adam Langley <agl@google.com> | 2015-01-08 11:00:16 -0800 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-01-08 19:03:05 +0000 |
commit | 17119400e38d564dfe411dbd668f706cc2bae9da (patch) | |
tree | f79688ffee130465ae0ade705bf13c8696e72ea1 | |
parent | 4d0a1a754849469f9b60a586094550404c27cb32 (diff) | |
download | chromium_src-17119400e38d564dfe411dbd668f706cc2bae9da.zip chromium_src-17119400e38d564dfe411dbd668f706cc2bae9da.tar.gz chromium_src-17119400e38d564dfe411dbd668f706cc2bae9da.tar.bz2 |
Merge "net: remove pinning for crypto.cat" to M40.
https://crypto.cat is broken in Chrome at the moment with pinning error
because they switched CA certs while renewing certificates. They don't
wish to update their certificates so this change removes the pinning.
BUG=446240
R=palmer@chromium.org
Review URL: https://codereview.chromium.org/835963002
(cherry picked from commit b4efad77d9b3a5a49b398052fbf43d51b906aea1)
Cr-Commit-Position: refs/branch-heads/2214@{#405}
Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
-rw-r--r-- | net/http/transport_security_state_static.certs | 46 | ||||
-rw-r--r-- | net/http/transport_security_state_static.h | 457 | ||||
-rw-r--r-- | net/http/transport_security_state_static.json | 9 | ||||
-rw-r--r-- | net/http/transport_security_state_unittest.cc | 3 |
4 files changed, 224 insertions, 291 deletions
diff --git a/net/http/transport_security_state_static.certs b/net/http/transport_security_state_static.certs index 525d05b..33eb510 100644 --- a/net/http/transport_security_state_static.certs +++ b/net/http/transport_security_state_static.certs @@ -1100,52 +1100,6 @@ OGoICNdTHC2Tr8kTe9RsxDrE+4CsuzpOVHrNTrM+7fH8EU6f9fMUvLmxMc72qi+l +MPpZqmyIJ3E+LgDYqeF0RhjWw== -----END CERTIFICATE----- -CryptoCat1 ------BEGIN CERTIFICATE----- -MIIHtTCCBp2gAwIBAgIQBQJvUvveB1Ep7CH9FkuAMjANBgkqhkiG9w0BAQUFADBm -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSUwIwYDVQQDExxEaWdpQ2VydCBIaWdoIEFzc3VyYW5j -ZSBDQS0zMB4XDTEyMTEwOTAwMDAwMFoXDTE1MDExMjEyMDAwMFowczELMAkGA1UE -BhMCQ0ExDzANBgNVBAgTBlF1ZWJlYzERMA8GA1UEBxMITW9udHJlYWwxFzAVBgNV -BAoTDk5hZGltIEtvYmVpc3NpMRIwEAYDVQQLEwlDcnlwdG9jYXQxEzARBgNVBAMT -CmNyeXB0by5jYXQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDS1vdN -oZ+gNyjs3RnyQ0ZfQ8aGeRvnzYBZsZawwmRN/aSzdYhwxENAKr1wUnJk7aiXhYWq -Z+ME/GUI8/89LHyHImQtVxTVRgfDSQSeciP7fplJGDNTz9+IOS849doom2sTsolH -WJtJ/ggSDX4igDc+6/c3D1rz34gAGspQ1XK2TZEcPvN6+IW9a+BUqYMfyRZmoft6 -YfDDf8S36weyyIASoRc9nB02wvOJ/7ME8sbExXbUEjQBr/HFcI3IwElft32zLsVu -NWdYz0TsFHG5tPhHSGQ/QI85uON4TJthlu3T0lV//T5nME2hijRcMo4C/yD+JK5Y -4h0tLCHrce4xx4au4EPF2YoGO8IEPVlQLJb5Yz92vQaAA15NnDSCVlb4Tfe6zwsf -7qBBobM9A1ZTKDtQiZZLHIACmJ4EfENtSFE+On3y31vvkaWXRROgo1Z0ECNBynb4 -ubPTlR2ZlAeE7Qp3b3GdMmnIP8QPn6tSxqYEveLwqOhXD/Upa5qxjnbbwQk1SRpA -Pbvz5waGzA/9UXLwcgJguqh3cLIuKmOysCG6qiSkpfzSdeCDa4vheLJl+rUbS0DV -abcRkRUmzRvNCeYYlTe6I0gHRC1UPef8aj2ppinw+9dWiQVxhjjIhw8JyGjM5Qg9 -NH5lDyXEuoS7f/VOTOOhAHvHSl5Ec/iXYU7PpQIDAQABo4IDUDCCA0wwHwYDVR0j -BBgwFoAUUOpzidsp+xCPnuUBINTeeZlIg/cwHQYDVR0OBBYEFPtM/u402qRHQsv4 -C3aUc3BKnofhMCUGA1UdEQQeMByCCmNyeXB0by5jYXSCDnd3dy5jcnlwdG8uY2F0 -MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw -YQYDVR0fBFowWDAqoCigJoYkaHR0cDovL2NybDMuZGlnaWNlcnQuY29tL2NhMy1n -MTYuY3JsMCqgKKAmhiRodHRwOi8vY3JsNC5kaWdpY2VydC5jb20vY2EzLWcxNi5j -cmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwBATCCAaQwOgYIKwYBBQUH -AgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5o -dG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0 -AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1 -AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABp -AGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBl -AGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBo -AGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAg -AGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAg -AGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wewYIKwYBBQUHAQEEbzBtMCQGCCsG -AQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRQYIKwYBBQUHMAKGOWh0 -dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VD -QS0zLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUAA4IBAQBlJ+AAe5Il -9Tj9ZD7Equ9JjdbKi5srhjEDtDXtvl/2ga8Bjbh2qs0Qb18DtfpdTdIPuDF2KKjW -kIQabl4h8s5NcQ/U7+AssAyKZGjiHs40G0iAlHpMeo/YzzEVqfoG+AT6c8caL4b0 -M2FnRee23OuKUdPixln3iShViViKt29NqDliIu4/IaeB7WkgJgljtIPNPZVoNqXa -TvwjIDhO+wtc3qXjtO1zej3+GBmGz7RcZckturc2pZe3NRWQ7wO8ZzWShWU/ii3z -2PftKlqZo3WAeJoUCPtQNsLnBFGvdUx2rUZwMhdgPuGeV4kEULAtu8M74xR5/Opz -nRGP22zr1K4q ------END CERTIFICATE----- - Libertylavabitcom -----BEGIN CERTIFICATE----- MIIGWjCCBUKgAwIBAgIHAMn6RGIIgjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE diff --git a/net/http/transport_security_state_static.h b/net/http/transport_security_state_static.h index 604afa1..81c9957 100644 --- a/net/http/transport_security_state_static.h +++ b/net/http/transport_security_state_static.h @@ -466,10 +466,6 @@ static const char kSPKIHash_AlphaSSL_G2[] = "\xe5\x24\xe9\x8e\x31\x7d\xc8\xfc\xad\x90" "\x53\x7c\x91\xe7\x0d\xa4\x70\x93\x90\x5f"; -static const char kSPKIHash_CryptoCat1[] = - "\x4c\x87\xce\x85\x2c\xf4\xc0\x4d\x67\xa9" - "\xe0\xec\x51\x0c\x7f\x3b\x14\xb3\xe9\xc9"; - static const char kSPKIHash_Libertylavabitcom[] = "\x41\xbb\x3b\x8b\xc7\xcf\x3d\x13\x3f\x17" "\xb3\x25\x7e\xe4\x03\xca\x8a\x5c\x6d\x36"; @@ -631,11 +627,6 @@ static const char* const kTor2webAcceptableCerts[] = { kSPKIHash_Tor2web, NULL, }; -static const char* const kCryptoCatAcceptableCerts[] = { - kSPKIHash_DigiCertEVRoot, - kSPKIHash_CryptoCat1, - NULL, -}; static const char* const kLavabitAcceptableCerts[] = { kSPKIHash_Libertylavabitcom, NULL, @@ -681,7 +672,6 @@ static const struct Pinset kPinsets[] = { {kTwitterComAcceptableCerts, kNoRejectedPublicKeys}, {kTwitterCDNAcceptableCerts, kNoRejectedPublicKeys}, {kTor2webAcceptableCerts, kNoRejectedPublicKeys}, - {kCryptoCatAcceptableCerts, kNoRejectedPublicKeys}, {kLavabitAcceptableCerts, kNoRejectedPublicKeys}, {kDropboxAcceptableCerts, kNoRejectedPublicKeys}, {kFacebookAcceptableCerts, kNoRejectedPublicKeys}, @@ -1420,21 +1410,21 @@ static const uint8 kPreloadedHSTSData[] = { 0xf8, 0x15, 0x3a, 0x5c, 0x27, 0xaf, 0xf2, 0xf9, 0xfb, 0xf4, 0xd5, 0xac, 0xb9, 0xd3, 0xea, 0x36, 0x7e, 0xca, 0x4e, 0x9f, 0x7a, 0xab, 0x43, 0x0f, - 0x97, 0xec, 0xf9, 0x78, 0x41, 0xa1, 0xf2, 0xfd, - 0x9b, 0x9e, 0x7c, 0xbf, 0x67, 0xb4, 0x7e, 0x54, - 0xf9, 0x7e, 0xc6, 0xa7, 0xa3, 0xf2, 0x29, 0xf2, - 0xe5, 0x73, 0xe7, 0xcb, 0xf6, 0x0f, 0x97, 0xec, - 0xdd, 0x73, 0xe5, 0xfa, 0xc2, 0xde, 0x4f, 0xf9, - 0xfd, 0x68, 0x93, 0x3d, 0x9b, 0x1e, 0x01, 0xf2, - 0xfd, 0x83, 0xe5, 0xfb, 0x30, 0x14, 0xf9, 0x7e, - 0xcf, 0xf6, 0x03, 0x87, 0x1b, 0x66, 0xa7, 0xcb, - 0xf6, 0x7e, 0xcb, 0x7a, 0xba, 0x50, 0x7c, 0xbf, + 0x87, 0xec, 0xf9, 0x78, 0x41, 0xa1, 0xf0, 0xfd, + 0x9b, 0x9e, 0x7c, 0x3f, 0x67, 0xb4, 0x7e, 0x54, + 0xf8, 0x7e, 0xc6, 0xa7, 0xa3, 0xf2, 0x29, 0xf2, + 0xe5, 0x73, 0xe7, 0xc3, 0xf6, 0x0f, 0x87, 0xec, + 0xdd, 0x73, 0xe1, 0xfa, 0xc2, 0xde, 0x4f, 0xf9, + 0xfd, 0x68, 0x93, 0x3d, 0x9b, 0x1e, 0x01, 0xf0, + 0xfd, 0x83, 0xe1, 0xfb, 0x30, 0x14, 0xf8, 0x7e, + 0xcf, 0xf6, 0x03, 0x87, 0x1b, 0x66, 0xa7, 0xc3, + 0xf6, 0x7e, 0xcb, 0x7a, 0xba, 0x50, 0x7c, 0x3f, 0x60, 0x08, 0xa3, 0xf9, 0x15, 0x51, 0x67, 0x86, - 0x85, 0xb9, 0xf2, 0xfd, 0x83, 0xe5, 0xfb, 0x86, - 0xba, 0x60, 0x84, 0xf9, 0x7e, 0xc3, 0xd5, 0x88, + 0x85, 0xb9, 0xf0, 0xfd, 0x83, 0xe1, 0xfb, 0x86, + 0xba, 0x60, 0x84, 0xf8, 0x7e, 0xc3, 0xd5, 0x88, 0xea, 0x6b, 0x90, 0x84, 0xa6, 0x13, 0xa2, 0x52, 0xc3, 0x1a, 0xc2, 0xea, 0xeb, 0xc1, 0x26, 0x9e, - 0xc7, 0xae, 0xd2, 0xe5, 0xfa, 0xe4, 0x47, 0xcf, + 0xc7, 0xae, 0xd2, 0xe1, 0xfa, 0xe4, 0x47, 0xcf, 0xfb, 0x13, 0x5c, 0x10, 0xf5, 0x9a, 0x3a, 0x67, 0xd0, 0x54, 0x50, 0x89, 0x5a, 0x50, 0x7e, 0x7b, 0x02, 0xb9, 0x29, 0xd3, 0x8c, 0x53, 0xff, 0xf5, @@ -1676,7 +1666,7 @@ static const uint8 kPreloadedHSTSData[] = { 0xda, 0x13, 0x20, 0x21, 0x9f, 0xcb, 0xf7, 0xff, 0x30, 0x07, 0x4f, 0xe7, 0xe0, 0xd7, 0xeb, 0x41, 0xd3, 0xff, 0xca, 0xd9, 0x45, 0xdb, 0xef, 0xfc, - 0xa3, 0xc2, 0x7b, 0xbd, 0xe7, 0xff, 0xb2, 0xeb, + 0xa3, 0xc2, 0x7b, 0x3d, 0xe7, 0xff, 0xb2, 0xeb, 0xf4, 0xcb, 0xdb, 0xc2, 0x04, 0x3a, 0x7d, 0xd5, 0xcf, 0xdc, 0xe9, 0xd7, 0xed, 0x99, 0xd3, 0xfa, 0xf6, 0xf3, 0x81, 0xde, 0x3a, 0x28, 0x4c, 0x8f, @@ -1758,8 +1748,8 @@ static const uint8 kPreloadedHSTSData[] = { 0x9c, 0x54, 0x66, 0x6f, 0x79, 0xd3, 0xd7, 0xa3, 0xbe, 0x74, 0xf5, 0x35, 0xeb, 0x9d, 0x14, 0x1e, 0xee, 0x0c, 0xd8, 0x8a, 0x7f, 0x7f, 0x83, 0x5a, - 0xa8, 0x0e, 0x9c, 0x10, 0x84, 0xf8, 0x7d, 0x4e, - 0xef, 0xea, 0x5c, 0x3e, 0x9c, 0x6a, 0x63, 0x54, + 0xa8, 0x0e, 0x9c, 0x10, 0x84, 0xf7, 0x7d, 0x4e, + 0xef, 0xea, 0x5b, 0xbe, 0x9c, 0x6a, 0x63, 0x54, 0x4a, 0x01, 0x6e, 0x7f, 0xfd, 0x9f, 0xf6, 0xd7, 0x56, 0xf6, 0xd3, 0x9e, 0xf5, 0x3a, 0x28, 0x3f, 0xcd, 0xa4, 0x91, 0xb2, 0x95, 0x77, 0xbc, 0xd3, @@ -1975,218 +1965,217 @@ static const uint8 kPreloadedHSTSData[] = { 0xfc, 0x03, 0xa1, 0xb8, 0xa9, 0xc7, 0x0b, 0x50, 0xc2, 0x95, 0xa1, 0x3e, 0xe8, 0x49, 0x5d, 0x75, 0xb1, 0xac, 0xf8, 0x53, 0xb9, 0x0d, 0x11, 0x74, - 0xfa, 0xe0, 0xdf, 0xf7, 0x96, 0xcf, 0x69, 0x3b, - 0x0f, 0x9f, 0x8c, 0x21, 0xc9, 0x84, 0x3e, 0x1c, - 0x53, 0xff, 0x33, 0x9e, 0xec, 0x14, 0xee, 0x43, - 0x44, 0xcd, 0x3a, 0x95, 0xa9, 0xd3, 0x93, 0xcc, - 0x3a, 0x76, 0xca, 0xd8, 0xd9, 0x47, 0x4f, 0x93, - 0xad, 0xe6, 0x8e, 0x9f, 0xf9, 0xbf, 0xd7, 0xf2, - 0x7b, 0x5b, 0xe2, 0x1d, 0x3f, 0xff, 0xda, 0x77, - 0xd3, 0xf9, 0xad, 0xb4, 0xdd, 0x65, 0x78, 0xad, - 0x07, 0x46, 0x22, 0xc6, 0xc8, 0xf3, 0xff, 0xed, - 0x7d, 0xfa, 0x32, 0xbe, 0xeb, 0x38, 0x21, 0x09, - 0x53, 0xc9, 0xdc, 0x86, 0x8b, 0x3e, 0x7f, 0xfb, - 0xc3, 0x6e, 0xdd, 0x8d, 0xbf, 0x95, 0xcf, 0x9d, - 0x38, 0x21, 0x09, 0x53, 0xfe, 0xe7, 0xd7, 0xf8, - 0x9a, 0xe0, 0x94, 0xe2, 0xf2, 0x7f, 0x96, 0xde, - 0xd7, 0xfd, 0xcd, 0x1d, 0x3f, 0xde, 0xfe, 0xbb, - 0xf5, 0xd2, 0xf5, 0x3a, 0x11, 0x3b, 0x31, 0x58, - 0xb1, 0x58, 0x1b, 0x6e, 0x96, 0xd8, 0xe6, 0x7f, - 0xff, 0xfe, 0xcc, 0x05, 0x73, 0x3f, 0xb7, 0x78, - 0xfd, 0x72, 0xce, 0xaf, 0xf2, 0x86, 0x63, 0x0e, - 0x9d, 0x55, 0xa0, 0xe9, 0xdb, 0x19, 0x63, 0xa1, - 0xe8, 0xc4, 0xac, 0x22, 0xae, 0x39, 0x3d, 0x48, - 0x34, 0x43, 0xa7, 0xd6, 0xfa, 0xe0, 0x99, 0x3f, - 0xef, 0x0b, 0xf0, 0x68, 0xd3, 0xb5, 0x34, 0x41, - 0xae, 0x34, 0xb3, 0xee, 0x4f, 0x31, 0x4e, 0x9f, - 0x9f, 0x6f, 0xf5, 0x37, 0x3a, 0x58, 0x87, 0xa7, - 0xf2, 0x59, 0xff, 0xff, 0x70, 0x6f, 0x96, 0xba, - 0xe7, 0xe9, 0xbe, 0x0f, 0xa8, 0xe6, 0x1d, 0x0f, - 0x4d, 0x03, 0x21, 0x5f, 0xf2, 0x69, 0xf8, 0x73, - 0x5a, 0xd9, 0x4e, 0x9f, 0xff, 0xda, 0x7f, 0xb6, - 0xee, 0xdf, 0xfe, 0xbd, 0x7d, 0x4d, 0xbc, 0x13, - 0xa7, 0xff, 0xfa, 0xb5, 0x51, 0xba, 0xb9, 0x99, - 0x7a, 0xef, 0xaf, 0x3f, 0x0e, 0x9e, 0xb6, 0x79, - 0xb1, 0xd1, 0xe4, 0x44, 0xd9, 0x9a, 0x66, 0x6c, - 0x86, 0x8b, 0xf2, 0x7f, 0xe7, 0xdf, 0x47, 0xbd, - 0x97, 0xba, 0xb0, 0xe9, 0xff, 0xbd, 0x9f, 0xcc, - 0xae, 0xe7, 0xd5, 0x87, 0x45, 0x28, 0x8b, 0xaa, - 0x34, 0xf7, 0xfe, 0xa8, 0x74, 0x2a, 0x63, 0x5a, - 0x91, 0xe4, 0x2c, 0xf8, 0x92, 0x7f, 0xff, 0xe6, - 0xf5, 0xb7, 0x98, 0xe6, 0x9f, 0xc3, 0xbe, 0xde, - 0xa6, 0xa9, 0xea, 0x0e, 0x9f, 0x69, 0x95, 0xf7, - 0xce, 0x9e, 0xdf, 0xa7, 0x54, 0xe9, 0xff, 0x5e, - 0xa0, 0xf5, 0x34, 0xbf, 0x2e, 0x74, 0x29, 0xf2, - 0xe1, 0x24, 0xcd, 0x68, 0x74, 0x98, 0x74, 0x52, - 0x6a, 0x1b, 0xb1, 0x89, 0xff, 0xff, 0x5b, 0xd4, - 0xdf, 0x29, 0xb8, 0x8a, 0xdc, 0x1b, 0xfe, 0xfb, - 0x61, 0xd3, 0x82, 0x10, 0x95, 0x3d, 0xae, 0xbd, - 0xf2, 0x9c, 0x5e, 0x4f, 0xfb, 0xac, 0x9e, 0xed, - 0xd5, 0xeb, 0x1d, 0x0a, 0x99, 0x12, 0x13, 0xfa, - 0x11, 0x76, 0x32, 0x9f, 0xfb, 0x3f, 0x4d, 0xf0, - 0x7d, 0x47, 0x30, 0xe9, 0xf6, 0x5d, 0xec, 0xb1, - 0xd0, 0xa7, 0xd7, 0x54, 0x49, 0x81, 0x63, 0xa7, - 0xea, 0x1a, 0x7b, 0x70, 0x68, 0x3a, 0x7f, 0x6d, - 0xb6, 0x5e, 0xde, 0xb9, 0xd3, 0x78, 0x4e, 0x8d, - 0x94, 0x7f, 0xde, 0x34, 0xb1, 0xac, 0xff, 0xed, - 0x75, 0x5d, 0x45, 0x6f, 0xe4, 0xf6, 0xa7, 0x49, - 0xcd, 0xd1, 0x99, 0xd5, 0xb2, 0xc3, 0x8a, 0x37, - 0x41, 0x5e, 0xb0, 0xd8, 0xc8, 0xf5, 0x69, 0x8c, - 0x73, 0xc6, 0xad, 0x47, 0x10, 0x26, 0xac, 0x2c, - 0xb4, 0xa0, 0xde, 0x41, 0x03, 0xd7, 0xe1, 0x1b, - 0x58, 0xda, 0xaf, 0x0a, 0xc0, 0x90, 0xec, 0x42, - 0x53, 0x79, 0xac, 0x39, 0x9d, 0x25, 0x6a, 0x69, - 0xb4, 0xff, 0xe7, 0x33, 0x9e, 0xec, 0x14, 0xee, - 0x43, 0x44, 0xd9, 0x3f, 0x9d, 0x82, 0x9d, 0xc8, - 0x68, 0xab, 0x67, 0xf3, 0xdf, 0xa5, 0xfe, 0xaf, - 0x3a, 0x7b, 0x2d, 0xd7, 0x3a, 0x5b, 0x26, 0x1e, - 0xa7, 0xcd, 0x27, 0xc2, 0x9d, 0xc8, 0x68, 0xad, - 0x27, 0xff, 0x91, 0x47, 0x01, 0xcc, 0xe7, 0xaf, - 0x90, 0xe9, 0xff, 0xe7, 0xd7, 0x3e, 0xac, 0xec, - 0xbd, 0xd5, 0x87, 0x4d, 0x7b, 0xaa, 0x25, 0xf9, - 0x2a, 0x7f, 0x2b, 0x6d, 0xf7, 0xfa, 0x80, 0xe9, - 0xfa, 0x8c, 0xb7, 0xb1, 0x87, 0x4f, 0xf6, 0x37, - 0xfd, 0x43, 0x4b, 0xea, 0x74, 0xfe, 0x7e, 0x5f, - 0xbe, 0x0d, 0x0e, 0x93, 0x9b, 0x89, 0xf9, 0x61, - 0x67, 0xa1, 0x8f, 0x62, 0xde, 0x36, 0xf9, 0x6d, - 0xcf, 0x27, 0xf3, 0xb0, 0x53, 0xb9, 0x0d, 0x16, - 0x04, 0xf8, 0x53, 0xb9, 0x0d, 0x13, 0xac, 0xff, - 0xfe, 0xb2, 0xd1, 0xae, 0x31, 0xd5, 0xae, 0x5b, - 0xd5, 0xd2, 0x83, 0xa7, 0xce, 0x67, 0x3d, 0xd8, - 0x89, 0x56, 0x8c, 0x27, 0xc2, 0x9d, 0xc8, 0x68, - 0xb6, 0x67, 0xfc, 0x05, 0xab, 0xad, 0xe4, 0xe1, - 0x3a, 0x4e, 0xc3, 0xec, 0xe3, 0x09, 0xe4, 0xee, - 0x43, 0x45, 0xcd, 0x26, 0x1d, 0x33, 0xb0, 0x4d, - 0xd8, 0x4a, 0xe7, 0xf3, 0xb0, 0x53, 0xb9, 0x0d, - 0x17, 0x7c, 0xf3, 0xb6, 0xea, 0x03, 0xa1, 0x5b, - 0x49, 0x8c, 0xa7, 0x5d, 0xa1, 0x85, 0x2a, 0x5e, - 0x95, 0x02, 0x2e, 0x4c, 0x86, 0x80, 0x21, 0x59, - 0x56, 0x1b, 0x95, 0xef, 0x3b, 0x9f, 0xf7, 0xf9, - 0xcb, 0x5a, 0xb3, 0x9e, 0x74, 0xfe, 0xfd, 0x18, - 0xdf, 0x75, 0xda, 0x74, 0xf8, 0x53, 0xb9, 0x0d, - 0x12, 0xbc, 0xf6, 0x9c, 0x2f, 0x3a, 0x7f, 0xff, - 0x7a, 0xfc, 0xce, 0xf8, 0x2c, 0x1e, 0xfd, 0x09, - 0xea, 0x0e, 0x95, 0xb5, 0x44, 0x1f, 0x10, 0xce, - 0xe7, 0xb9, 0x53, 0x14, 0xc3, 0x8a, 0xc2, 0xce, - 0x75, 0xd7, 0x52, 0xa7, 0xff, 0x5b, 0xbd, 0x75, - 0x7f, 0x86, 0x8d, 0x00, 0x54, 0xfe, 0xe4, 0x76, - 0xa2, 0xdd, 0xb9, 0x4f, 0x9e, 0xa3, 0x92, 0x72, - 0x2a, 0x4b, 0x64, 0x6a, 0x2d, 0xa1, 0x59, 0x3f, - 0xf9, 0xcc, 0xe7, 0xbb, 0x05, 0x3b, 0x90, 0xd1, - 0x30, 0xcf, 0xff, 0xd8, 0xed, 0xe3, 0xc0, 0x76, - 0xdb, 0xbc, 0x2b, 0x57, 0x9d, 0x3f, 0xf6, 0xc9, - 0x94, 0xbf, 0x4e, 0xbf, 0xd5, 0xe7, 0x4f, 0xf7, - 0xd7, 0xa8, 0xbe, 0xde, 0x13, 0xa7, 0xe6, 0x2e, - 0x7e, 0xfb, 0x07, 0x4f, 0x97, 0x3f, 0x7d, 0x83, - 0xa7, 0xeb, 0x7a, 0xf5, 0xea, 0x77, 0x1e, 0xc3, - 0x0b, 0xe7, 0xff, 0xfd, 0xfc, 0x0b, 0x7d, 0xf2, - 0xdb, 0xbf, 0x94, 0x7b, 0x3f, 0x4b, 0xea, 0x74, - 0xfc, 0xdb, 0x7d, 0xfe, 0xa0, 0x3a, 0x7f, 0xf2, - 0xdc, 0x0a, 0xfc, 0xa6, 0xf4, 0x68, 0x13, 0xa1, - 0x4f, 0xf7, 0xc6, 0x33, 0xf5, 0x7d, 0xb5, 0x9d, - 0x73, 0xa7, 0xff, 0xfc, 0x38, 0xd9, 0x7f, 0x7d, - 0xdb, 0xfe, 0xb6, 0xef, 0x5d, 0x6f, 0x53, 0xa5, - 0x94, 0xa2, 0x7c, 0x4b, 0xe7, 0xbe, 0xa0, 0xde, - 0x74, 0xf7, 0x6f, 0xd7, 0x0e, 0x93, 0x9b, 0x8a, - 0xd0, 0x75, 0x4a, 0x48, 0x48, 0xb4, 0x91, 0x68, - 0x78, 0x7e, 0x18, 0x17, 0x28, 0xd0, 0x8e, 0x7c, - 0x29, 0xdc, 0x86, 0x8a, 0xba, 0x7f, 0x9e, 0xec, - 0x14, 0xee, 0x43, 0x44, 0x79, 0x27, 0x61, 0xf8, - 0xf1, 0x84, 0xfe, 0x76, 0x0a, 0x77, 0x21, 0xa2, - 0xc1, 0x9f, 0xce, 0xc1, 0x4e, 0xe4, 0x34, 0x59, - 0x53, 0xf9, 0xd8, 0x29, 0xdc, 0x86, 0x8b, 0x4e, - 0x79, 0x3b, 0x90, 0xd1, 0x6e, 0x4f, 0xfc, 0xb8, - 0x39, 0xfd, 0xd6, 0xca, 0x42, 0x74, 0x09, 0xf7, - 0xd4, 0xae, 0x7f, 0xdc, 0xf7, 0x60, 0xa7, 0x72, - 0x1a, 0x28, 0x79, 0xfb, 0xed, 0xcc, 0x15, 0xa9, - 0xd3, 0xff, 0xf6, 0x6b, 0x65, 0xde, 0xeb, 0xff, - 0x81, 0x5a, 0xa8, 0x0a, 0x93, 0xb1, 0x1e, 0x6c, - 0x21, 0xd1, 0x1b, 0x60, 0xbe, 0x7f, 0x3b, 0x05, - 0x3b, 0x90, 0xd1, 0x79, 0xc2, 0xaf, 0xf7, 0x3d, - 0x13, 0x55, 0x2c, 0x97, 0x3f, 0x4c, 0x3f, 0xc4, - 0x99, 0x87, 0x76, 0x3b, 0xfc, 0x73, 0xad, 0x91, - 0xa7, 0xf3, 0xb0, 0x53, 0xb9, 0x0d, 0x14, 0xb4, - 0xfe, 0x76, 0x0a, 0x77, 0x21, 0xa2, 0xc2, 0x9f, - 0xce, 0xc1, 0x4e, 0xe4, 0x34, 0x59, 0x73, 0xce, - 0xdb, 0xb2, 0xf9, 0xba, 0x9d, 0x39, 0xdb, 0xd8, - 0x74, 0xf2, 0x39, 0x6a, 0x87, 0xa5, 0xa1, 0xa4, - 0xff, 0xe7, 0x33, 0x9e, 0xec, 0x14, 0xee, 0x43, - 0x45, 0x19, 0x3f, 0x9c, 0xad, 0x94, 0x54, 0x07, - 0x43, 0xd3, 0xbf, 0x13, 0xb6, 0x1d, 0xf4, 0x23, - 0x6a, 0x71, 0x75, 0x29, 0xff, 0x9d, 0xcf, 0x76, - 0x0a, 0x77, 0x21, 0xa2, 0x39, 0x9f, 0xfc, 0xe6, - 0x73, 0xdd, 0x82, 0x9d, 0xc8, 0x68, 0x9c, 0xa7, - 0xf3, 0xb0, 0x53, 0xb9, 0x0d, 0x16, 0x64, 0xfe, - 0x76, 0x0a, 0x77, 0x21, 0xa2, 0xdd, 0x9f, 0xfc, - 0xe6, 0x73, 0xdd, 0x82, 0x9d, 0xc8, 0x68, 0xa4, - 0x27, 0xfe, 0x77, 0x3d, 0xd8, 0x29, 0xdc, 0x86, - 0x89, 0x4a, 0x28, 0x4e, 0xc9, 0xa4, 0xc6, 0x29, - 0x7c, 0xee, 0xe7, 0x6d, 0xea, 0x53, 0xfe, 0xe7, - 0xbb, 0x05, 0x3b, 0x90, 0xd1, 0x3b, 0x4f, 0xff, - 0xbd, 0xae, 0x8c, 0x56, 0xfe, 0xd7, 0xeb, 0xfc, - 0x43, 0xa4, 0xe6, 0x22, 0x7f, 0x91, 0xa7, 0xfe, - 0xe6, 0x5b, 0x13, 0xac, 0xbb, 0xde, 0x74, 0xff, - 0xdf, 0xcb, 0x75, 0x19, 0x5f, 0xf5, 0x27, 0x4d, - 0xb0, 0xed, 0x51, 0x0f, 0x54, 0x38, 0x62, 0x38, - 0xb6, 0x21, 0x5f, 0x3e, 0x14, 0xee, 0x43, 0x44, - 0x59, 0x3f, 0xee, 0x7b, 0xb0, 0x53, 0xb9, 0x0d, - 0x12, 0xec, 0xff, 0xfd, 0x9a, 0xd9, 0x77, 0xba, - 0xff, 0xe0, 0x56, 0xaa, 0x02, 0xa4, 0xec, 0x46, - 0x9b, 0x0c, 0x36, 0x11, 0xa7, 0xff, 0x39, 0x9c, - 0xf7, 0x60, 0xa7, 0x72, 0x1a, 0x26, 0x29, 0xfc, - 0xec, 0x14, 0xee, 0x43, 0x45, 0x53, 0x3f, 0xf9, - 0xcc, 0xe7, 0xbb, 0x05, 0x3b, 0x90, 0xd1, 0x3a, - 0x4f, 0xef, 0x70, 0xab, 0xf9, 0xb1, 0xd3, 0xe6, - 0x95, 0xa5, 0xa9, 0xd3, 0xf0, 0x73, 0xcd, 0xb3, - 0xe7, 0x4f, 0x7a, 0xca, 0xef, 0x1e, 0xb5, 0x4a, - 0x27, 0xfe, 0xd2, 0xb7, 0x5a, 0x5d, 0xa3, 0x5e, - 0x61, 0xd0, 0xc4, 0x41, 0x58, 0xe6, 0x7f, 0xdc, - 0xf7, 0x60, 0xa7, 0x72, 0x1a, 0x27, 0x79, 0xf5, - 0xf4, 0xe6, 0x78, 0xa9, 0x3b, 0x54, 0xe6, 0xf2, - 0x30, 0xa6, 0x11, 0xf2, 0x34, 0xff, 0xe7, 0x33, - 0x9e, 0xec, 0x14, 0xee, 0x43, 0x45, 0x0b, 0x3f, + 0xfa, 0xe0, 0xdf, 0xf7, 0x95, 0x27, 0x61, 0xed, + 0x71, 0x84, 0x39, 0x1f, 0x6f, 0x86, 0xac, 0xff, + 0xcc, 0xe7, 0xbb, 0x05, 0x3b, 0x90, 0xd1, 0x33, + 0x4e, 0xa5, 0x6a, 0x74, 0xe4, 0xf3, 0x0e, 0x9d, + 0xb2, 0xb6, 0x36, 0x51, 0xd3, 0xe4, 0xeb, 0x79, + 0xa3, 0xa7, 0xfe, 0x6f, 0xf5, 0xfc, 0x9e, 0xd6, + 0xf8, 0x87, 0x4f, 0xff, 0xf6, 0x9d, 0xf4, 0xfe, + 0x6b, 0x6d, 0x37, 0x59, 0x5e, 0x2b, 0x41, 0xd1, + 0x88, 0xb1, 0xb2, 0x3c, 0xff, 0xfb, 0x5f, 0x7e, + 0x8c, 0xaf, 0xba, 0xce, 0x08, 0x42, 0x54, 0xf2, + 0x77, 0x21, 0xa2, 0xcf, 0x9f, 0xfe, 0xf0, 0xdb, + 0xb7, 0x63, 0x6f, 0xe5, 0x73, 0xe7, 0x4e, 0x08, + 0x42, 0x54, 0xff, 0xb9, 0xf5, 0xfe, 0x26, 0xb8, + 0x25, 0x38, 0xbc, 0x9f, 0xe5, 0xb7, 0xb5, 0xff, + 0x73, 0x47, 0x4f, 0xf7, 0xbf, 0xae, 0xfd, 0x74, + 0xbd, 0x4e, 0x84, 0x4e, 0xcc, 0x56, 0x2c, 0x56, + 0x06, 0xdb, 0xa5, 0xb6, 0x39, 0x9f, 0xff, 0xff, + 0xb3, 0x01, 0x5c, 0xcf, 0xed, 0xde, 0x3f, 0x5c, + 0xb3, 0xab, 0xfc, 0xa1, 0x98, 0xc3, 0xa7, 0x55, + 0x68, 0x3a, 0x76, 0xc6, 0x58, 0xe8, 0x7a, 0x31, + 0x2b, 0x08, 0xab, 0x8e, 0x4f, 0x52, 0x0d, 0x10, + 0xe9, 0xf5, 0xbe, 0xb8, 0x26, 0x4f, 0xfb, 0xc2, + 0xfc, 0x1a, 0x34, 0xed, 0x4d, 0x10, 0x6b, 0x8d, + 0x2c, 0xfb, 0x93, 0xcc, 0x53, 0xa7, 0xe7, 0xdb, + 0xfd, 0x4d, 0xce, 0x96, 0x21, 0xe9, 0xfc, 0x96, + 0x7f, 0xff, 0xdc, 0x1b, 0xe5, 0xae, 0xb9, 0xfa, + 0x6f, 0x83, 0xea, 0x39, 0x87, 0x43, 0xd3, 0x40, + 0xc8, 0x57, 0xfc, 0x9a, 0x7e, 0x1c, 0xd6, 0xb6, + 0x53, 0xa7, 0xff, 0xf6, 0x9f, 0xed, 0xbb, 0xb7, + 0xff, 0xaf, 0x5f, 0x53, 0x6f, 0x04, 0xe9, 0xff, + 0xfe, 0xad, 0x54, 0x6e, 0xae, 0x66, 0x5e, 0xbb, + 0xeb, 0xcf, 0xc3, 0xa7, 0xad, 0x9e, 0x6c, 0x74, + 0x79, 0x11, 0x36, 0x66, 0x99, 0x9b, 0x21, 0xa2, + 0xfc, 0x9f, 0xf9, 0xf7, 0xd1, 0xef, 0x65, 0xee, + 0xac, 0x3a, 0x7f, 0xef, 0x67, 0xf3, 0x2b, 0xb9, + 0xf5, 0x61, 0xd1, 0x4a, 0x22, 0xea, 0x8d, 0x3d, + 0xff, 0xaa, 0x1d, 0x0a, 0x98, 0xd6, 0xa4, 0x79, + 0x0b, 0x3e, 0x24, 0x9f, 0xff, 0xf9, 0xbd, 0x6d, + 0xe6, 0x39, 0xa7, 0xf0, 0xef, 0xb7, 0xa9, 0xaa, + 0x7a, 0x83, 0xa7, 0xda, 0x65, 0x7d, 0xf3, 0xa7, + 0xb7, 0xe9, 0xd5, 0x3a, 0x7f, 0xd7, 0xa8, 0x3d, + 0x4d, 0x2f, 0xcb, 0x9d, 0x0a, 0x7c, 0xb8, 0x49, + 0x33, 0x5a, 0x1d, 0x26, 0x1d, 0x14, 0x9a, 0x86, + 0xec, 0x62, 0x7f, 0xff, 0xd6, 0xf5, 0x37, 0xca, + 0x6e, 0x22, 0xb7, 0x06, 0xff, 0xbe, 0xd8, 0x74, + 0xe0, 0x84, 0x25, 0x4f, 0x6b, 0xaf, 0x7c, 0xa7, + 0x17, 0x93, 0xfe, 0xeb, 0x27, 0xbb, 0x75, 0x7a, + 0xc7, 0x42, 0xa6, 0x44, 0x84, 0xfe, 0x84, 0x5d, + 0x8c, 0xa7, 0xfe, 0xcf, 0xd3, 0x7c, 0x1f, 0x51, + 0xcc, 0x3a, 0x7d, 0x97, 0x7b, 0x2c, 0x74, 0x29, + 0xf5, 0xd5, 0x12, 0x60, 0x58, 0xe9, 0xfa, 0x86, + 0x9e, 0xdc, 0x1a, 0x0e, 0x9f, 0xdb, 0x6d, 0x97, + 0xb7, 0xae, 0x74, 0xde, 0x13, 0xa3, 0x65, 0x1f, + 0xf7, 0x8d, 0x2c, 0x6b, 0x3f, 0xfb, 0x5d, 0x57, + 0x51, 0x5b, 0xf9, 0x3d, 0xa9, 0xd2, 0x73, 0x74, + 0x66, 0x75, 0x6c, 0xb0, 0xe2, 0x8d, 0xd0, 0x57, + 0xac, 0x36, 0x32, 0x3d, 0x5a, 0x63, 0x1c, 0xf1, + 0xab, 0x51, 0xc4, 0x09, 0xab, 0x0b, 0x2d, 0x28, + 0x37, 0x90, 0x40, 0xf5, 0xf8, 0x46, 0xd6, 0x36, + 0xab, 0xc2, 0xb0, 0x24, 0x3b, 0x10, 0x94, 0xde, + 0x6b, 0x0e, 0x67, 0x49, 0x5a, 0x9a, 0x6d, 0x3f, 0xf9, 0xcc, 0xe7, 0xbb, 0x05, 0x3b, 0x90, 0xd1, - 0x49, 0x4f, 0xff, 0xec, 0xab, 0xb7, 0xe3, 0x56, - 0xe6, 0x5e, 0xcb, 0x7d, 0x18, 0x74, 0x50, 0xb8, - 0x06, 0xf3, 0x84, 0x52, 0x13, 0xb6, 0x47, 0xda, - 0x04, 0x9d, 0x14, 0xb6, 0x14, 0xa7, 0xf3, 0xb0, - 0x53, 0xb9, 0x0d, 0x11, 0x24, 0xff, 0xe7, 0x33, - 0x9e, 0xec, 0x14, 0xee, 0x43, 0x44, 0xbd, 0x3e, - 0x14, 0xee, 0x43, 0x45, 0x2f, 0x3f, 0x97, 0x56, - 0xff, 0x31, 0x6a, 0x74, 0x9d, 0x87, 0xcd, 0x73, - 0x09, 0xfc, 0xec, 0x14, 0xee, 0x43, 0x45, 0x39, - 0x3f, 0xef, 0x0f, 0x56, 0xd9, 0x9f, 0x43, 0xa7, - 0xfd, 0x96, 0x51, 0xc7, 0x04, 0x21, 0x2a, 0x6f, - 0x04, 0xe9, 0xa8, 0x76, 0xa8, 0x8d, 0xd8, 0x3b, - 0x6f, 0x3c, 0x9f, 0x0a, 0x77, 0x21, 0xa2, 0xbc, - 0x9f, 0xff, 0xb3, 0x5b, 0x2e, 0xf7, 0x5f, 0xfc, - 0x0a, 0xd5, 0x40, 0x54, 0x9d, 0x88, 0x8d, 0xd8, - 0x30, 0x9f, 0xf9, 0xdc, 0xf7, 0x60, 0xa7, 0x72, - 0x1a, 0x24, 0x79, 0xde, 0x02, 0x9d, 0x39, 0x31, - 0x85, 0x38, 0xbb, 0x9f, 0x0a, 0x77, 0x21, 0xa2, - 0x48, 0x9e, 0x77, 0x3d, 0xca, 0x7b, 0x38, 0x53, - 0x3f, 0xf3, 0xb9, 0xee, 0xc1, 0x4e, 0xe4, 0x34, - 0x49, 0x53, 0xe1, 0x4e, 0xe4, 0x34, 0x5e, 0x33, - 0xf6, 0x9f, 0xa7, 0xa9, 0xa9, 0xd3, 0xea, 0xd6, - 0xf8, 0x87, 0x4f, 0xf3, 0xdd, 0x82, 0x9d, 0xc8, - 0x68, 0x93, 0x64, 0xec, 0x46, 0x3d, 0x26, 0x02, - 0x61, 0xc4, 0xd0, 0xab, 0xa5, 0x34, 0x1d, 0xbe, - 0x17, 0x1a, 0x93, 0xfa, 0x19, 0x0d, 0x43, 0x45, - 0x85, 0x76, 0x86, 0x05, 0xcd, 0xf4, 0x8c, 0x4e, - 0x16, 0x36, 0x98, 0x9a, 0x23, 0xae, 0x7c, 0x79, - 0x3a, 0xc7, 0xb5, 0x96, 0xe4, 0x47, 0x6c, 0xa5, - 0x64, 0xaf, 0xb3, 0x69, 0x9e, 0x7b, 0xf4, 0xe6, - 0x26, 0xce, 0x3b, 0x06, 0xa9, 0xa9, 0xe3, 0x48, - 0xf0, 0x66, 0x22, 0x86, 0x2d, 0x3b, 0x51, 0xd4, - 0xe7, 0x80, 0x4b, 0x0e, 0x6e, 0xe1, 0x63, 0xf9, - 0xe4, 0x8a, 0xd2, 0x3a, 0xef, 0x5c, 0x90, 0x69, - 0x4a, 0xef, 0x6d, 0x29, 0x80, 0x32, 0x83, 0x76, - 0x23, 0xde, 0xdf, 0x3a, 0x02, 0xdf, 0x3b, 0x4d, - 0x00, + 0x36, 0x4f, 0xe7, 0x60, 0xa7, 0x72, 0x1a, 0x2a, + 0xd9, 0xfc, 0xf7, 0xe9, 0x7f, 0xab, 0xce, 0x9e, + 0xcb, 0x75, 0xce, 0x96, 0xc9, 0x87, 0xa9, 0xf3, + 0x49, 0xf0, 0xa7, 0x72, 0x1a, 0x2b, 0x49, 0xff, + 0xe4, 0x51, 0xc0, 0x73, 0x39, 0xeb, 0xe4, 0x3a, + 0x7f, 0xf9, 0xf5, 0xcf, 0xab, 0x3b, 0x2f, 0x75, + 0x61, 0xd3, 0x5e, 0xea, 0x89, 0x7e, 0x4a, 0x9f, + 0xca, 0xdb, 0x7d, 0xfe, 0xa0, 0x3a, 0x7e, 0xa3, + 0x2d, 0xec, 0x61, 0xd3, 0xfd, 0x8d, 0xff, 0x50, + 0xd2, 0xfa, 0x9d, 0x3f, 0x9f, 0x97, 0xef, 0x83, + 0x43, 0xa4, 0xe6, 0xe2, 0x7e, 0x58, 0x59, 0xe8, + 0x63, 0xd8, 0xb7, 0x8d, 0xbe, 0x5b, 0x73, 0xc9, + 0xfc, 0xec, 0x14, 0xee, 0x43, 0x45, 0x81, 0x3e, + 0x14, 0xee, 0x43, 0x44, 0xeb, 0x3f, 0xff, 0xac, + 0xb4, 0x6b, 0x8c, 0x75, 0x6b, 0x96, 0xf5, 0x74, + 0xa0, 0xe9, 0xf3, 0x99, 0xcf, 0x76, 0x22, 0x55, + 0xa3, 0x09, 0xf0, 0xa7, 0x72, 0x1a, 0x2d, 0x99, + 0xff, 0x01, 0x6a, 0xeb, 0x79, 0x38, 0x4e, 0x93, + 0xb0, 0xfb, 0x38, 0xc2, 0x79, 0x3b, 0x90, 0xd1, + 0x73, 0x49, 0x87, 0x4c, 0xec, 0x13, 0x76, 0x12, + 0xb9, 0xfc, 0xec, 0x14, 0xee, 0x43, 0x45, 0xdf, + 0x3c, 0xed, 0xba, 0x80, 0xe8, 0x56, 0xd2, 0x5f, + 0x29, 0xd7, 0x48, 0x61, 0x4a, 0x97, 0xa5, 0x40, + 0x8b, 0x93, 0x21, 0xa0, 0x08, 0x56, 0x55, 0x86, + 0xe5, 0x7b, 0xce, 0xe7, 0xfd, 0xfe, 0x72, 0xd6, + 0xac, 0xe7, 0x9d, 0x3f, 0xbf, 0x46, 0x37, 0xdd, + 0x76, 0x9d, 0x3e, 0x14, 0xee, 0x43, 0x44, 0xaf, + 0x3d, 0xa7, 0x0b, 0xce, 0x9f, 0xff, 0xde, 0xbf, + 0x33, 0xbe, 0x0b, 0x07, 0xbf, 0x42, 0x7a, 0x83, + 0xa5, 0x6d, 0x51, 0x07, 0xc4, 0x33, 0xb9, 0xee, + 0x54, 0xc5, 0x30, 0xe2, 0xb0, 0xb3, 0x9d, 0x75, + 0xd4, 0xa9, 0xff, 0xd6, 0xef, 0x5d, 0x5f, 0xe1, + 0xa3, 0x40, 0x15, 0x3f, 0xb9, 0x1d, 0xa8, 0xb7, + 0x6e, 0x53, 0xe7, 0xa8, 0xe4, 0x9c, 0x8a, 0x92, + 0xd9, 0x1a, 0x8b, 0x68, 0x56, 0x4f, 0xfe, 0x73, + 0x39, 0xee, 0xc1, 0x4e, 0xe4, 0x34, 0x4c, 0x33, + 0xff, 0xf6, 0x3b, 0x78, 0xf0, 0x1d, 0xb6, 0xef, + 0x0a, 0xd5, 0xe7, 0x4f, 0xfd, 0xb2, 0x65, 0x2f, + 0xd3, 0xaf, 0xf5, 0x79, 0xd3, 0xfd, 0xf5, 0xea, + 0x2f, 0xb7, 0x84, 0xe9, 0xf9, 0x8b, 0x9f, 0xbe, + 0xc1, 0xd3, 0xe5, 0xcf, 0xdf, 0x60, 0xe9, 0xfa, + 0xde, 0xbd, 0x7a, 0x9d, 0xc7, 0xb0, 0xc2, 0xf9, + 0xff, 0xff, 0x7f, 0x02, 0xdf, 0x7c, 0xb6, 0xef, + 0xe5, 0x1e, 0xcf, 0xd2, 0xfa, 0x9d, 0x3f, 0x36, + 0xdf, 0x7f, 0xa8, 0x0e, 0x9f, 0xfc, 0xb7, 0x02, + 0xbf, 0x29, 0xbd, 0x1a, 0x04, 0xe8, 0x53, 0xfd, + 0xf1, 0x8c, 0xfd, 0x5f, 0x6d, 0x67, 0x5c, 0xe9, + 0xff, 0xff, 0x0e, 0x36, 0x5f, 0xdf, 0x76, 0xff, + 0xad, 0xbb, 0xd7, 0x5b, 0xd4, 0xe9, 0x65, 0x28, + 0x9f, 0x12, 0xf9, 0xef, 0xa8, 0x37, 0x9d, 0x3d, + 0xdb, 0xf5, 0xc3, 0xa4, 0xe6, 0xe2, 0xb4, 0x1d, + 0x52, 0x92, 0x12, 0x2d, 0x24, 0x5a, 0x1e, 0x1f, + 0x86, 0x05, 0xca, 0x34, 0x23, 0x9f, 0x0a, 0x77, + 0x21, 0xa2, 0xae, 0x9f, 0xe7, 0xbb, 0x05, 0x3b, + 0x90, 0xd1, 0x1e, 0x49, 0xd8, 0x7e, 0x3c, 0x61, + 0x3f, 0x9d, 0x82, 0x9d, 0xc8, 0x68, 0xb0, 0x67, + 0xf3, 0xb0, 0x53, 0xb9, 0x0d, 0x16, 0x54, 0xfe, + 0x76, 0x0a, 0x77, 0x21, 0xa2, 0xd3, 0x9e, 0x4e, + 0xe4, 0x34, 0x5b, 0x93, 0xff, 0x2e, 0x0e, 0x7f, + 0x75, 0xb2, 0x90, 0x9d, 0x02, 0x7d, 0xf5, 0x2b, + 0x9f, 0xf7, 0x3d, 0xd8, 0x29, 0xdc, 0x86, 0x8a, + 0x1e, 0x7e, 0xfb, 0x73, 0x05, 0x6a, 0x74, 0xff, + 0xfd, 0x9a, 0xd9, 0x77, 0xba, 0xff, 0xe0, 0x56, + 0xaa, 0x02, 0xa4, 0xec, 0x47, 0x9b, 0x08, 0x74, + 0x46, 0xd8, 0x2f, 0x9f, 0xce, 0xc1, 0x4e, 0xe4, + 0x34, 0x5e, 0x70, 0xab, 0xfd, 0xcf, 0x44, 0xd5, + 0x4b, 0x25, 0xcf, 0xd3, 0x0f, 0xf1, 0x26, 0x61, + 0xdd, 0x8e, 0xff, 0x1c, 0xeb, 0x64, 0x69, 0xfc, + 0xec, 0x14, 0xee, 0x43, 0x45, 0x2d, 0x3f, 0x9d, + 0x82, 0x9d, 0xc8, 0x68, 0xb0, 0xa7, 0xf3, 0xb0, + 0x53, 0xb9, 0x0d, 0x16, 0x5c, 0xf3, 0xb6, 0xec, + 0xbe, 0x6e, 0xa7, 0x4e, 0x76, 0xf6, 0x1d, 0x3c, + 0x8e, 0x5a, 0xa1, 0xe9, 0x68, 0x69, 0x3f, 0xf9, + 0xcc, 0xe7, 0xbb, 0x05, 0x3b, 0x90, 0xd1, 0x46, + 0x4f, 0xe7, 0x2b, 0x65, 0x15, 0x01, 0xd0, 0xf4, + 0xef, 0xc4, 0xed, 0x87, 0x7d, 0x08, 0xda, 0x9c, + 0x5d, 0x4a, 0x7f, 0xe7, 0x73, 0xdd, 0x82, 0x9d, + 0xc8, 0x68, 0x8e, 0x67, 0xff, 0x39, 0x9c, 0xf7, + 0x60, 0xa7, 0x72, 0x1a, 0x27, 0x29, 0xfc, 0xec, + 0x14, 0xee, 0x43, 0x45, 0x99, 0x3f, 0x9d, 0x82, + 0x9d, 0xc8, 0x68, 0xb7, 0x67, 0xff, 0x39, 0x9c, + 0xf7, 0x60, 0xa7, 0x72, 0x1a, 0x29, 0x09, 0xff, + 0x9d, 0xcf, 0x76, 0x0a, 0x77, 0x21, 0xa2, 0x52, + 0x8a, 0x13, 0xb2, 0x69, 0x31, 0x8a, 0x5f, 0x3b, + 0xb9, 0xdb, 0x7a, 0x94, 0xff, 0xb9, 0xee, 0xc1, + 0x4e, 0xe4, 0x34, 0x4e, 0xd3, 0xff, 0xef, 0x6b, + 0xa3, 0x15, 0xbf, 0xb5, 0xfa, 0xff, 0x10, 0xe9, + 0x39, 0x88, 0x9f, 0xe4, 0x69, 0xff, 0xb9, 0x96, + 0xc4, 0xeb, 0x2e, 0xf7, 0x9d, 0x3f, 0xf7, 0xf2, + 0xdd, 0x46, 0x57, 0xfd, 0x49, 0xd3, 0x6c, 0x3b, + 0x54, 0x43, 0xd5, 0x0e, 0x18, 0x8e, 0x2d, 0x88, + 0x57, 0xcf, 0x85, 0x3b, 0x90, 0xd1, 0x16, 0x4f, + 0xfb, 0x9e, 0xec, 0x14, 0xee, 0x43, 0x44, 0xbb, + 0x3f, 0xff, 0x66, 0xb6, 0x5d, 0xee, 0xbf, 0xf8, + 0x15, 0xaa, 0x80, 0xa9, 0x3b, 0x11, 0xa6, 0xc3, + 0x0d, 0x84, 0x69, 0xff, 0xce, 0x67, 0x3d, 0xd8, + 0x29, 0xdc, 0x86, 0x89, 0x8a, 0x7f, 0x3b, 0x05, + 0x3b, 0x90, 0xd1, 0x54, 0xcf, 0xfe, 0x73, 0x39, + 0xee, 0xc1, 0x4e, 0xe4, 0x34, 0x4e, 0x93, 0xfb, + 0xdc, 0x2a, 0xfe, 0x6c, 0x74, 0xf9, 0xa5, 0x69, + 0x6a, 0x74, 0xfc, 0x1c, 0xf3, 0x6c, 0xf9, 0xd3, + 0xde, 0xb2, 0xbb, 0xc7, 0xad, 0x52, 0x89, 0xff, + 0xb4, 0xad, 0xd6, 0x97, 0x68, 0xd7, 0x98, 0x74, + 0x31, 0x10, 0x56, 0x39, 0x9f, 0xf7, 0x3d, 0xd8, + 0x29, 0xdc, 0x86, 0x89, 0xde, 0x7d, 0x7d, 0x39, + 0x9e, 0x2a, 0x4e, 0xd5, 0x39, 0xbc, 0x8c, 0x29, + 0x84, 0x7c, 0x8d, 0x3f, 0xf9, 0xcc, 0xe7, 0xbb, + 0x05, 0x3b, 0x90, 0xd1, 0x42, 0xcf, 0xfe, 0x73, + 0x39, 0xee, 0xc1, 0x4e, 0xe4, 0x34, 0x52, 0x53, + 0xff, 0xfb, 0x2a, 0xed, 0xf8, 0xd5, 0xb9, 0x97, + 0xb2, 0xdf, 0x46, 0x1d, 0x14, 0x2e, 0x01, 0xbc, + 0xe1, 0x14, 0x84, 0xed, 0x91, 0xf6, 0x81, 0x27, + 0x45, 0x2d, 0x85, 0x29, 0xfc, 0xec, 0x14, 0xee, + 0x43, 0x44, 0x49, 0x3f, 0xf9, 0xcc, 0xe7, 0xbb, + 0x05, 0x3b, 0x90, 0xd1, 0x2f, 0x4f, 0x85, 0x3b, + 0x90, 0xd1, 0x4b, 0xcf, 0xe5, 0xd5, 0xbf, 0xcc, + 0x5a, 0x9d, 0x27, 0x61, 0xf3, 0x5c, 0xc2, 0x7f, + 0x3b, 0x05, 0x3b, 0x90, 0xd1, 0x4e, 0x4f, 0xfb, + 0xc3, 0xd5, 0xb6, 0x67, 0xd0, 0xe9, 0xff, 0x65, + 0x94, 0x71, 0xc1, 0x08, 0x4a, 0x9b, 0xc1, 0x3a, + 0x6a, 0x1d, 0xaa, 0x23, 0x76, 0x0e, 0xdb, 0xcf, + 0x27, 0xc2, 0x9d, 0xc8, 0x68, 0xaf, 0x27, 0xff, + 0xec, 0xd6, 0xcb, 0xbd, 0xd7, 0xff, 0x02, 0xb5, + 0x50, 0x15, 0x27, 0x62, 0x23, 0x76, 0x0c, 0x27, + 0xfe, 0x77, 0x3d, 0xd8, 0x29, 0xdc, 0x86, 0x89, + 0x1e, 0x77, 0x80, 0xa7, 0x4e, 0x4c, 0x61, 0x4e, + 0x2e, 0xe7, 0xc2, 0x9d, 0xc8, 0x68, 0x92, 0x27, + 0x9d, 0xcf, 0x72, 0x9e, 0xce, 0x14, 0xcf, 0xfc, + 0xee, 0x7b, 0xb0, 0x53, 0xb9, 0x0d, 0x12, 0x54, + 0xf8, 0x53, 0xb9, 0x0d, 0x17, 0x8c, 0xfd, 0xa7, + 0xe9, 0xea, 0x6a, 0x74, 0xfa, 0xb5, 0xbe, 0x21, + 0xd3, 0xfc, 0xf7, 0x60, 0xa7, 0x72, 0x1a, 0x24, + 0xd9, 0x3b, 0x11, 0x8f, 0x49, 0x80, 0x98, 0x71, + 0x34, 0x2a, 0xe9, 0x4d, 0x07, 0x6f, 0x85, 0xc6, + 0xa4, 0xfe, 0x86, 0x43, 0x50, 0xd1, 0x61, 0x5d, + 0xa1, 0x81, 0x73, 0x7d, 0x23, 0x13, 0x85, 0x8d, + 0xa5, 0xee, 0x88, 0xeb, 0x9f, 0x1e, 0x4e, 0xb1, + 0xed, 0x65, 0xb9, 0x11, 0xdb, 0x29, 0x59, 0x2b, + 0xec, 0xda, 0x67, 0x9e, 0xfd, 0x39, 0x89, 0xb3, + 0x8e, 0xc1, 0xaa, 0x6a, 0x78, 0xd2, 0x3c, 0x19, + 0x88, 0xa1, 0x8b, 0x4e, 0xd4, 0x75, 0x39, 0xe0, + 0x12, 0xc3, 0x9b, 0xb8, 0x58, 0xfe, 0x79, 0x22, + 0xb4, 0x8e, 0xbb, 0xd7, 0x22, 0x5a, 0x52, 0xbb, + 0xdb, 0x4a, 0x60, 0x0c, 0xa0, 0xdd, 0x88, 0xf7, + 0xb7, 0xce, 0x80, 0xb7, 0xce, 0xd3, 0x40, }; -static const unsigned kPreloadedHSTSBits = 94466; +static const unsigned kPreloadedHSTSBits = 94452; -static const unsigned kHSTSRootPosition = 93889; +static const unsigned kHSTSRootPosition = 93875; #endif // NET_HTTP_TRANSPORT_SECURITY_STATE_STATIC_H_ diff --git a/net/http/transport_security_state_static.json b/net/http/transport_security_state_static.json index 1e5484e..1997690 100644 --- a/net/http/transport_security_state_static.json +++ b/net/http/transport_security_state_static.json @@ -143,13 +143,6 @@ ] }, { - "name": "cryptoCat", - "static_spki_hashes": [ - "DigiCertEVRoot", - "CryptoCat1" - ] - }, - { "name": "lavabit", "static_spki_hashes": [ "Libertylavabitcom" @@ -575,7 +568,7 @@ { "name": "www.developer.mydigipass.com", "mode": "force-https" }, { "name": "sandbox.mydigipass.com", "mode": "force-https" }, { "name": "www.sandbox.mydigipass.com", "mode": "force-https" }, - { "name": "crypto.cat", "mode": "force-https", "pins": "cryptoCat" }, + { "name": "crypto.cat", "mode": "force-https" }, { "name": "bigshinylock.minazo.net", "include_subdomains": true, "mode": "force-https" }, { "name": "crate.io", "include_subdomains": true, "mode": "force-https" }, { "name": "twitter.com", "mode": "force-https", "pins": "twitterCom" }, diff --git a/net/http/transport_security_state_unittest.cc b/net/http/transport_security_state_unittest.cc index eb72050..f5c640f 100644 --- a/net/http/transport_security_state_unittest.cc +++ b/net/http/transport_security_state_unittest.cc @@ -477,9 +477,6 @@ TEST_F(TransportSecurityStateTest, Preloaded) { EXPECT_TRUE(StaticShouldRedirect("www.sandbox.mydigipass.com")); EXPECT_FALSE(StaticShouldRedirect("foo.www.sandbox.mydigipass.com")); - EXPECT_TRUE(StaticShouldRedirect("crypto.cat")); - EXPECT_FALSE(StaticShouldRedirect("foo.crypto.cat")); - EXPECT_TRUE(StaticShouldRedirect("bigshinylock.minazo.net")); EXPECT_TRUE(StaticShouldRedirect("foo.bigshinylock.minazo.net")); |