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

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

Issue 10545166: Support SHA-256 in public key pins for HTTPS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months 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 | « net/base/x509_certificate_win.cc ('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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 scoped_refptr<base::SequencedTaskRunner> nss_task_runner_; 147 scoped_refptr<base::SequencedTaskRunner> nss_task_runner_;
148 scoped_ptr<ClientSocketHandle> transport_; 148 scoped_ptr<ClientSocketHandle> transport_;
149 HostPortPair host_and_port_; 149 HostPortPair host_and_port_;
150 SSLConfig ssl_config_; 150 SSLConfig ssl_config_;
151 151
152 scoped_refptr<Core> core_; 152 scoped_refptr<Core> core_;
153 153
154 CompletionCallback user_connect_callback_; 154 CompletionCallback user_connect_callback_;
155 155
156 CertVerifyResult server_cert_verify_result_; 156 CertVerifyResult server_cert_verify_result_;
157 std::vector<SHA1Fingerprint> side_pinned_public_keys_; 157 HashValueVector side_pinned_public_keys_;
158 158
159 CertVerifier* const cert_verifier_; 159 CertVerifier* const cert_verifier_;
160 scoped_ptr<SingleRequestCertVerifier> verifier_; 160 scoped_ptr<SingleRequestCertVerifier> verifier_;
161 161
162 // For domain bound certificates in client auth. 162 // For domain bound certificates in client auth.
163 ServerBoundCertService* server_bound_cert_service_; 163 ServerBoundCertService* server_bound_cert_service_;
164 164
165 // ssl_session_cache_shard_ is an opaque string that partitions the SSL 165 // ssl_session_cache_shard_ is an opaque string that partitions the SSL
166 // session cache. i.e. sessions created with one value will not attempt to 166 // session cache. i.e. sessions created with one value will not attempt to
167 // resume on the socket with a different value. 167 // resume on the socket with a different value.
(...skipping 20 matching lines...) Expand all
188 // Added the following code Debugging in release mode. 188 // Added the following code Debugging in release mode.
189 mutable base::Lock lock_; 189 mutable base::Lock lock_;
190 // This is mutable so that CalledOnValidThread can set it. 190 // This is mutable so that CalledOnValidThread can set it.
191 // It's guarded by |lock_|. 191 // It's guarded by |lock_|.
192 mutable base::PlatformThreadId valid_thread_id_; 192 mutable base::PlatformThreadId valid_thread_id_;
193 }; 193 };
194 194
195 } // namespace net 195 } // namespace net
196 196
197 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 197 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW
« no previous file with comments | « net/base/x509_certificate_win.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698