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

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

Issue 416683002: This CL corrects a bug in which the OnHandshakeComplete callback for an ssl session was never called (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@r2
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
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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 // SSLClientSocket implementation. 100 // SSLClientSocket implementation.
101 virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain() 101 virtual scoped_refptr<X509Certificate> GetUnverifiedServerCertificateChain()
102 const OVERRIDE; 102 const OVERRIDE;
103 103
104 private: 104 private:
105 class PeerCertificateChain; 105 class PeerCertificateChain;
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 // Callback that is run by OpenSSL when a session's handshake has finished.
111 static void OnSessionFinishedCallback(const SSL* ssl, int result, int unused);
112
110 int Init(); 113 int Init();
111 void DoReadCallback(int result); 114 void DoReadCallback(int result);
112 void DoWriteCallback(int result); 115 void DoWriteCallback(int result);
113 116
114 // Compute a unique key string for the SSL session cache. 117 // Compute a unique key string for the SSL session cache.
115 std::string GetSessionCacheKey() const; 118 std::string GetSessionCacheKey() const;
116 void OnHandshakeCompletion(); 119 void OnHandshakeCompletion();
117 120
118 bool DoTransportIO(); 121 bool DoTransportIO();
119 int DoHandshake(); 122 int DoHandshake();
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 // True if channel ID extension was negotiated. 254 // True if channel ID extension was negotiated.
252 bool channel_id_xtn_negotiated_; 255 bool channel_id_xtn_negotiated_;
253 // The request handle for |server_bound_cert_service_|. 256 // The request handle for |server_bound_cert_service_|.
254 ServerBoundCertService::RequestHandle channel_id_request_handle_; 257 ServerBoundCertService::RequestHandle channel_id_request_handle_;
255 BoundNetLog net_log_; 258 BoundNetLog net_log_;
256 }; 259 };
257 260
258 } // namespace net 261 } // namespace net
259 262
260 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 263 #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_session_cache_openssl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698