diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 15:02:51 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 15:02:51 +0000 |
| commit | 9123652116e1261111cfb2306709ee305ffb5bf2 (patch) | |
| tree | 7f53febadf5e99e225b308c0c843e53e39c63b64 /net/base/transport_security_state_static.json | |
| parent | 478df839eb3260d4b2602c7e6a8f5d6294213eef (diff) | |
| download | chromium_src-9123652116e1261111cfb2306709ee305ffb5bf2.zip chromium_src-9123652116e1261111cfb2306709ee305ffb5bf2.tar.gz chromium_src-9123652116e1261111cfb2306709ee305ffb5bf2.tar.bz2 | |
Revert 138795 - Revert "nss: revert encrypted and origin bound certificates support."
Cleaning up git-svn mess with drover.
TBR=agl@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10451012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/transport_security_state_static.json')
| -rw-r--r-- | net/base/transport_security_state_static.json | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/base/transport_security_state_static.json b/net/base/transport_security_state_static.json index c387ceb..9efd38a 100644 --- a/net/base/transport_security_state_static.json +++ b/net/base/transport_security_state_static.json @@ -123,6 +123,13 @@ "UTNUSERFirstObject", "GTECyberTrustGlobalRoot" ] + }, + { + "name": "tor2web", + "static_spki_hashes": [ + "AlphaSSL_G2", + "Tor2web" + ] } ], @@ -259,6 +266,7 @@ { "name": "braintreepayments.com", "mode": "force-https" }, { "name": "www.braintreepayments.com", "mode": "force-https" }, { "name": "emailprivacytester.com", "mode": "force-https" }, + { "name": "tor2web.org", "include_subdomains": true, "pins": "tor2web" }, // Entries that are only valid if the client supports SNI. { "name": "gmail.com", "mode": "force-https", "pins": "google", "snionly": true }, |