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

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, 6 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
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 #pragma once 7 #pragma once
8 8
9 #include <certt.h> 9 #include <certt.h>
10 #include <keyt.h> 10 #include <keyt.h>
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 scoped_refptr<Core> core_; 160 scoped_refptr<Core> core_;
161 161
162 CompletionCallback user_connect_callback_; 162 CompletionCallback user_connect_callback_;
163 163
164 // |server_cert_verify_result_| points at the verification result, which may, 164 // |server_cert_verify_result_| points at the verification result, which may,
165 // or may not be, |&local_server_cert_verify_result_|, depending on whether 165 // or may not be, |&local_server_cert_verify_result_|, depending on whether
166 // we used an SSLHostInfo's verification. 166 // we used an SSLHostInfo's verification.
167 const CertVerifyResult* server_cert_verify_result_; 167 const CertVerifyResult* server_cert_verify_result_;
168 CertVerifyResult local_server_cert_verify_result_; 168 CertVerifyResult local_server_cert_verify_result_;
169 std::vector<SHA1Fingerprint> side_pinned_public_keys_; 169 std::vector<Fingerprint> side_pinned_public_keys_;
170 170
171 CertVerifier* const cert_verifier_; 171 CertVerifier* const cert_verifier_;
172 scoped_ptr<SingleRequestCertVerifier> verifier_; 172 scoped_ptr<SingleRequestCertVerifier> verifier_;
173 173
174 // For domain bound certificates in client auth. 174 // For domain bound certificates in client auth.
175 ServerBoundCertService* server_bound_cert_service_; 175 ServerBoundCertService* server_bound_cert_service_;
176 176
177 // ssl_session_cache_shard_ is an opaque string that partitions the SSL 177 // ssl_session_cache_shard_ is an opaque string that partitions the SSL
178 // session cache. i.e. sessions created with one value will not attempt to 178 // session cache. i.e. sessions created with one value will not attempt to
179 // resume on the socket with a different value. 179 // resume on the socket with a different value.
(...skipping 22 matching lines...) Expand all
202 // Added the following code Debugging in release mode. 202 // Added the following code Debugging in release mode.
203 mutable base::Lock lock_; 203 mutable base::Lock lock_;
204 // This is mutable so that CalledOnValidThread can set it. 204 // This is mutable so that CalledOnValidThread can set it.
205 // It's guarded by |lock_|. 205 // It's guarded by |lock_|.
206 mutable base::PlatformThreadId valid_thread_id_; 206 mutable base::PlatformThreadId valid_thread_id_;
207 }; 207 };
208 208
209 } // namespace net 209 } // namespace net
210 210
211 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 211 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698