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

Side by Side Diff: net/socket/ssl_client_socket_nss.h

Issue 422063004: Certificate Transparency: Require SCTs for EV certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed histogram enum names Created 6 years 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
« no previous file with comments | « net/socket/ssl_client_socket.h ('k') | net/socket/ssl_client_socket_nss.cc » ('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 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
7 7
8 #include <certt.h> 8 #include <certt.h>
9 #include <keyt.h> 9 #include <keyt.h>
10 #include <nspr.h> 10 #include <nspr.h>
(...skipping 18 matching lines...) Expand all
29 #include "net/ssl/channel_id_service.h" 29 #include "net/ssl/channel_id_service.h"
30 #include "net/ssl/ssl_config_service.h" 30 #include "net/ssl/ssl_config_service.h"
31 31
32 namespace base { 32 namespace base {
33 class SequencedTaskRunner; 33 class SequencedTaskRunner;
34 } 34 }
35 35
36 namespace net { 36 namespace net {
37 37
38 class BoundNetLog; 38 class BoundNetLog;
39 class CertPolicyEnforcer;
39 class CertVerifier; 40 class CertVerifier;
40 class ChannelIDService; 41 class ChannelIDService;
41 class CTVerifier; 42 class CTVerifier;
42 class ClientSocketHandle; 43 class ClientSocketHandle;
43 class SingleRequestCertVerifier; 44 class SingleRequestCertVerifier;
44 class TransportSecurityState; 45 class TransportSecurityState;
45 class X509Certificate; 46 class X509Certificate;
46 47
47 // An SSL client socket implemented with Mozilla NSS. 48 // An SSL client socket implemented with Mozilla NSS.
48 class SSLClientSocketNSS : public SSLClientSocket { 49 class SSLClientSocketNSS : public SSLClientSocket {
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 // TODO(rsleevi): http://crbug.com/130616 - Remove this member once 193 // TODO(rsleevi): http://crbug.com/130616 - Remove this member once
193 // ExportKeyingMaterial is updated to be asynchronous. 194 // ExportKeyingMaterial is updated to be asynchronous.
194 PRFileDesc* nss_fd_; 195 PRFileDesc* nss_fd_;
195 196
196 BoundNetLog net_log_; 197 BoundNetLog net_log_;
197 198
198 base::TimeTicks start_cert_verification_time_; 199 base::TimeTicks start_cert_verification_time_;
199 200
200 TransportSecurityState* transport_security_state_; 201 TransportSecurityState* transport_security_state_;
201 202
203 CertPolicyEnforcer* const policy_enforcer_;
204
202 // pinning_failure_log contains a message produced by 205 // pinning_failure_log contains a message produced by
203 // TransportSecurityState::CheckPublicKeyPins in the event of a 206 // TransportSecurityState::CheckPublicKeyPins in the event of a
204 // pinning failure. It is a (somewhat) human-readable string. 207 // pinning failure. It is a (somewhat) human-readable string.
205 std::string pinning_failure_log_; 208 std::string pinning_failure_log_;
206 209
207 // The following two variables are added for debugging bug 65948. Will 210 // The following two variables are added for debugging bug 65948. Will
208 // remove this code after fixing bug 65948. 211 // remove this code after fixing bug 65948.
209 // Added the following code Debugging in release mode. 212 // Added the following code Debugging in release mode.
210 mutable base::Lock lock_; 213 mutable base::Lock lock_;
211 // This is mutable so that CalledOnValidThread can set it. 214 // This is mutable so that CalledOnValidThread can set it.
212 // It's guarded by |lock_|. 215 // It's guarded by |lock_|.
213 mutable base::PlatformThreadId valid_thread_id_; 216 mutable base::PlatformThreadId valid_thread_id_;
214 }; 217 };
215 218
216 } // namespace net 219 } // namespace net
217 220
218 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 221 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket.h ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698