Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: net/base/transport_security_state.cc

Issue 11369156: net: add a couple of entries to the HSTS preloaded list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | net/base/transport_security_state_static.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/transport_security_state.h" 5 #include "net/base/transport_security_state.h"
6 6
7 #if defined(USE_OPENSSL) 7 #if defined(USE_OPENSSL)
8 #include <openssl/ecdsa.h> 8 #include <openssl/ecdsa.h>
9 #include <openssl/ssl.h> 9 #include <openssl/ssl.h>
10 #else // !defined(USE_OPENSSL) 10 #else // !defined(USE_OPENSSL)
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 DOMAIN_GOOGLE_TN, 842 DOMAIN_GOOGLE_TN,
843 DOMAIN_GOOGLE_TO, 843 DOMAIN_GOOGLE_TO,
844 DOMAIN_GOOGLE_TP, 844 DOMAIN_GOOGLE_TP,
845 DOMAIN_GOOGLE_TT, 845 DOMAIN_GOOGLE_TT,
846 DOMAIN_GOOGLE_US, 846 DOMAIN_GOOGLE_US,
847 DOMAIN_GOOGLE_UZ, 847 DOMAIN_GOOGLE_UZ,
848 DOMAIN_GOOGLE_VG, 848 DOMAIN_GOOGLE_VG,
849 DOMAIN_GOOGLE_VU, 849 DOMAIN_GOOGLE_VU,
850 DOMAIN_GOOGLE_WS, 850 DOMAIN_GOOGLE_WS,
851 851
852 DOMAIN_CHROMIUM_ORG,
853
852 // Boundary value for UMA_HISTOGRAM_ENUMERATION: 854 // Boundary value for UMA_HISTOGRAM_ENUMERATION:
853 DOMAIN_NUM_EVENTS 855 DOMAIN_NUM_EVENTS
854 }; 856 };
855 857
856 // PublicKeyPins contains a number of SubjectPublicKeyInfo hashes for a site. 858 // PublicKeyPins contains a number of SubjectPublicKeyInfo hashes for a site.
857 // The validated certificate chain for the site must not include any of 859 // The validated certificate chain for the site must not include any of
858 // |excluded_hashes| and must include one or more of |required_hashes|. 860 // |excluded_hashes| and must include one or more of |required_hashes|.
859 struct PublicKeyPins { 861 struct PublicKeyPins {
860 const char* const* required_hashes; 862 const char* const* required_hashes;
861 const char* const* excluded_hashes; 863 const char* const* excluded_hashes;
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
1110 return true; 1112 return true;
1111 } 1113 }
1112 1114
1113 bool TransportSecurityState::DomainState::HasPins() const { 1115 bool TransportSecurityState::DomainState::HasPins() const {
1114 return static_spki_hashes.size() > 0 || 1116 return static_spki_hashes.size() > 0 ||
1115 bad_static_spki_hashes.size() > 0 || 1117 bad_static_spki_hashes.size() > 0 ||
1116 dynamic_spki_hashes.size() > 0; 1118 dynamic_spki_hashes.size() > 0;
1117 } 1119 }
1118 1120
1119 } // namespace 1121 } // namespace
OLDNEW
« no previous file with comments | « no previous file | net/base/transport_security_state_static.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698