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

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

Issue 994263002: Rewrite session cache in OpenSSL ports. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use base::MRUCache (hah, that would have saved me some time...) Created 5 years, 9 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
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 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 STATE_VERIFY_CERT_COMPLETE, 289 STATE_VERIFY_CERT_COMPLETE,
290 }; 290 };
291 State next_handshake_state_; 291 State next_handshake_state_;
292 NextProtoStatus npn_status_; 292 NextProtoStatus npn_status_;
293 std::string npn_proto_; 293 std::string npn_proto_;
294 // Written by the |channel_id_service_|. 294 // Written by the |channel_id_service_|.
295 std::string channel_id_private_key_; 295 std::string channel_id_private_key_;
296 std::string channel_id_cert_; 296 std::string channel_id_cert_;
297 // True if channel ID extension was negotiated. 297 // True if channel ID extension was negotiated.
298 bool channel_id_xtn_negotiated_; 298 bool channel_id_xtn_negotiated_;
299 // True if InfoCallback has been run with result = SSL_CB_HANDSHAKE_DONE. 299 // True if the initial handshake has completed.
300 bool handshake_succeeded_; 300 bool handshake_succeeded_;
301 // True if MarkSSLSessionAsGood has been called for this socket's 301 // True if the initial handshake's certificate has been verified.
302 // SSL session. 302 bool certificate_verified_;
Ryan Sleevi 2015/03/17 00:50:33 First blush review: This strikes me as a bad thing
davidben 2015/03/20 22:41:26 Acknowledged.
303 bool marked_session_as_good_;
304 // The request handle for |channel_id_service_|. 303 // The request handle for |channel_id_service_|.
305 ChannelIDService::RequestHandle channel_id_request_handle_; 304 ChannelIDService::RequestHandle channel_id_request_handle_;
306 305
307 TransportSecurityState* transport_security_state_; 306 TransportSecurityState* transport_security_state_;
308 307
309 CertPolicyEnforcer* const policy_enforcer_; 308 CertPolicyEnforcer* const policy_enforcer_;
310 309
311 // pinning_failure_log contains a message produced by 310 // pinning_failure_log contains a message produced by
312 // TransportSecurityState::CheckPublicKeyPins in the event of a 311 // TransportSecurityState::CheckPublicKeyPins in the event of a
313 // pinning failure. It is a (somewhat) human-readable string. 312 // pinning failure. It is a (somewhat) human-readable string.
314 std::string pinning_failure_log_; 313 std::string pinning_failure_log_;
315 314
316 BoundNetLog net_log_; 315 BoundNetLog net_log_;
317 base::WeakPtrFactory<SSLClientSocketOpenSSL> weak_factory_; 316 base::WeakPtrFactory<SSLClientSocketOpenSSL> weak_factory_;
318 }; 317 };
319 318
320 } // namespace net 319 } // namespace net
321 320
322 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 321 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698