Revert 138795 - Revert "nss: revert encrypted and origin bound certificates support."

net/base/transport_security_state.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/transport_security_state.h"
 
 #if defined(USE_OPENSSL)
 #include <openssl/ecdsa.h>
 #include <openssl/ssl.h>
 #else  // !defined(USE_OPENSSL)
@@ skipping 546 matching lines @@
   DOMAIN_GOOGLEMAIL_COM,
   DOMAIN_GOOGLEGROUPS_COM,
 
   DOMAIN_TORPROJECT_ORG,
 
   DOMAIN_TWITTER_COM,
   DOMAIN_TWIMG_COM,
 
   DOMAIN_AKAMAIHD_NET,
 
+  DOMAIN_TOR2WEB_ORG,
+
   // Boundary value for UMA_HISTOGRAM_ENUMERATION:
   DOMAIN_NUM_EVENTS
 };
 
 // PublicKeyPins contains a number of SubjectPublicKeyInfo hashes for a site.
 // The validated certificate chain for the site must not include any of
 // |excluded_hashes| and must include one or more of |required_hashes|.
 struct PublicKeyPins {
   const char* const* required_hashes;
   const char* const* excluded_hashes;
@@ skipping 217 matching lines @@
   return true;
 }
 
 bool TransportSecurityState::DomainState::HasPins() const {
   return static_spki_hashes.size() > 0 ||
          bad_static_spki_hashes.size() > 0 ||
          dynamic_spki_hashes.size() > 0;
 }
 
 }  // namespace