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

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

Issue 493793003: Align SSLClientSocketOpenSSL and SSLClientSocketNSS histograms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
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_OPENSSL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 bool client_auth_cert_needed_; 226 bool client_auth_cert_needed_;
227 // List of DER-encoded X.509 DistinguishedName of certificate authorities 227 // List of DER-encoded X.509 DistinguishedName of certificate authorities
228 // allowed by the server. 228 // allowed by the server.
229 std::vector<std::string> cert_authorities_; 229 std::vector<std::string> cert_authorities_;
230 // List of SSLClientCertType values for client certificates allowed by the 230 // List of SSLClientCertType values for client certificates allowed by the
231 // server. 231 // server.
232 std::vector<SSLClientCertType> cert_key_types_; 232 std::vector<SSLClientCertType> cert_key_types_;
233 233
234 CertVerifier* const cert_verifier_; 234 CertVerifier* const cert_verifier_;
235 scoped_ptr<SingleRequestCertVerifier> verifier_; 235 scoped_ptr<SingleRequestCertVerifier> verifier_;
236 base::TimeTicks start_cert_verification_time_;
236 237
237 // The service for retrieving Channel ID keys. May be NULL. 238 // The service for retrieving Channel ID keys. May be NULL.
238 ChannelIDService* channel_id_service_; 239 ChannelIDService* channel_id_service_;
239 240
240 // Callback that is invoked when the connection finishes. 241 // Callback that is invoked when the connection finishes.
241 // 242 //
242 // Note: this callback will be run in Disconnect(). It will not alter 243 // Note: this callback will be run in Disconnect(). It will not alter
243 // any member variables of the SSLClientSocketOpenSSL. 244 // any member variables of the SSLClientSocketOpenSSL.
244 base::Closure handshake_completion_callback_; 245 base::Closure handshake_completion_callback_;
245 246
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 // TransportSecurityState::CheckPublicKeyPins in the event of a 289 // TransportSecurityState::CheckPublicKeyPins in the event of a
289 // pinning failure. It is a (somewhat) human-readable string. 290 // pinning failure. It is a (somewhat) human-readable string.
290 std::string pinning_failure_log_; 291 std::string pinning_failure_log_;
291 292
292 BoundNetLog net_log_; 293 BoundNetLog net_log_;
293 }; 294 };
294 295
295 } // namespace net 296 } // namespace net
296 297
297 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 298 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698