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

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

Issue 1126113004: Split DoHandshake into DoHandshake and DoHandshakeComplete. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@handshake-refactor
Patch Set: Created 5 years, 7 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 class SSLContext; 106 class SSLContext;
107 friend class SSLClientSocket; 107 friend class SSLClientSocket;
108 friend class SSLContext; 108 friend class SSLContext;
109 109
110 int Init(); 110 int Init();
111 void DoReadCallback(int result); 111 void DoReadCallback(int result);
112 void DoWriteCallback(int result); 112 void DoWriteCallback(int result);
113 113
114 bool DoTransportIO(); 114 bool DoTransportIO();
115 int DoHandshake(); 115 int DoHandshake();
116 int DoHandshakeComplete(int result);
116 int DoChannelIDLookup(); 117 int DoChannelIDLookup();
117 int DoChannelIDLookupComplete(int result); 118 int DoChannelIDLookupComplete(int result);
118 int DoVerifyCert(int result); 119 int DoVerifyCert(int result);
119 int DoVerifyCertComplete(int result); 120 int DoVerifyCertComplete(int result);
120 void DoConnectCallback(int result); 121 void DoConnectCallback(int result);
121 void UpdateServerCert(); 122 void UpdateServerCert();
122 void VerifyCT(); 123 void VerifyCT();
123 124
124 void OnHandshakeIOComplete(int result); 125 void OnHandshakeIOComplete(int result);
125 void OnSendComplete(int result); 126 void OnSendComplete(int result);
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 const HostPortPair host_and_port_; 273 const HostPortPair host_and_port_;
273 SSLConfig ssl_config_; 274 SSLConfig ssl_config_;
274 // ssl_session_cache_shard_ is an opaque string that partitions the SSL 275 // ssl_session_cache_shard_ is an opaque string that partitions the SSL
275 // session cache. i.e. sessions created with one value will not attempt to 276 // session cache. i.e. sessions created with one value will not attempt to
276 // resume on the socket with a different value. 277 // resume on the socket with a different value.
277 const std::string ssl_session_cache_shard_; 278 const std::string ssl_session_cache_shard_;
278 279
279 enum State { 280 enum State {
280 STATE_NONE, 281 STATE_NONE,
281 STATE_HANDSHAKE, 282 STATE_HANDSHAKE,
283 STATE_HANDSHAKE_COMPLETE,
282 STATE_CHANNEL_ID_LOOKUP, 284 STATE_CHANNEL_ID_LOOKUP,
283 STATE_CHANNEL_ID_LOOKUP_COMPLETE, 285 STATE_CHANNEL_ID_LOOKUP_COMPLETE,
284 STATE_VERIFY_CERT, 286 STATE_VERIFY_CERT,
285 STATE_VERIFY_CERT_COMPLETE, 287 STATE_VERIFY_CERT_COMPLETE,
286 }; 288 };
287 State next_handshake_state_; 289 State next_handshake_state_;
288 NextProtoStatus npn_status_; 290 NextProtoStatus npn_status_;
289 std::string npn_proto_; 291 std::string npn_proto_;
290 // Written by the |channel_id_service_|. 292 // Written by the |channel_id_service_|.
291 std::string channel_id_private_key_; 293 std::string channel_id_private_key_;
(...skipping 16 matching lines...) Expand all
308 // pinning failure. It is a (somewhat) human-readable string. 310 // pinning failure. It is a (somewhat) human-readable string.
309 std::string pinning_failure_log_; 311 std::string pinning_failure_log_;
310 312
311 BoundNetLog net_log_; 313 BoundNetLog net_log_;
312 base::WeakPtrFactory<SSLClientSocketOpenSSL> weak_factory_; 314 base::WeakPtrFactory<SSLClientSocketOpenSSL> weak_factory_;
313 }; 315 };
314 316
315 } // namespace net 317 } // namespace net
316 318
317 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 319 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
OLDNEW
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_openssl.cc » ('j') | net/socket/ssl_client_socket_openssl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698