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

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

Issue 328903004: SSL Connect Job Waiting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a command line flag that enables my changes. Created 6 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
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 21 matching lines...) Expand all
32 typedef struct x509_store_ctx_st X509_STORE_CTX; 32 typedef struct x509_store_ctx_st X509_STORE_CTX;
33 33
34 namespace net { 34 namespace net {
35 35
36 class CertVerifier; 36 class CertVerifier;
37 class SingleRequestCertVerifier; 37 class SingleRequestCertVerifier;
38 class SSLCertRequestInfo; 38 class SSLCertRequestInfo;
39 class SSLInfo; 39 class SSLInfo;
40 40
41 // An SSL client socket implemented with OpenSSL. 41 // An SSL client socket implemented with OpenSSL.
42 class SSLClientSocketOpenSSL : public SSLClientSocket { 42 class NET_EXPORT SSLClientSocketOpenSSL : public SSLClientSocket {
wtc 2014/06/13 22:47:24 Use NET_EXPORT_PRIVATE if it is exported for net_u
mshelley1 2014/06/16 19:02:49 I think I included NET_EXPORT when I was attemptin
43 public: 43 public:
44 // Takes ownership of the transport_socket, which may already be connected. 44 // Takes ownership of the transport_socket, which may already be connected.
45 // The given hostname will be compared with the name(s) in the server's 45 // The given hostname will be compared with the name(s) in the server's
46 // certificate during the SSL handshake. ssl_config specifies the SSL 46 // certificate during the SSL handshake. ssl_config specifies the SSL
47 // settings. 47 // settings.
48 SSLClientSocketOpenSSL(scoped_ptr<ClientSocketHandle> transport_socket, 48 SSLClientSocketOpenSSL(scoped_ptr<ClientSocketHandle> transport_socket,
49 const HostPortPair& host_and_port, 49 const HostPortPair& host_and_port,
50 const SSLConfig& ssl_config, 50 const SSLConfig& ssl_config,
51 const SSLClientSocketContext& context); 51 const SSLClientSocketContext& context);
52 virtual ~SSLClientSocketOpenSSL(); 52 virtual ~SSLClientSocketOpenSSL();
53 53
54 const HostPortPair& host_and_port() const { return host_and_port_; } 54 const HostPortPair& host_and_port() const { return host_and_port_; }
55 const std::string& ssl_session_cache_shard() const { 55 const std::string& ssl_session_cache_shard() const {
56 return ssl_session_cache_shard_; 56 return ssl_session_cache_shard_;
57 } 57 }
58 58
59 // SSLClientSocket implementation. 59 // SSLClientSocket implementation.
60 static bool InSessionCache(std::string cache_key);
wtc 2014/06/13 22:47:24 1. This method should not be in the "SSLClientSock
mshelley1 2014/06/16 19:02:49 Done.
60 virtual void GetSSLCertRequestInfo( 61 virtual void GetSSLCertRequestInfo(
61 SSLCertRequestInfo* cert_request_info) OVERRIDE; 62 SSLCertRequestInfo* cert_request_info) OVERRIDE;
62 virtual NextProtoStatus GetNextProto(std::string* proto, 63 virtual NextProtoStatus GetNextProto(std::string* proto,
63 std::string* server_protos) OVERRIDE; 64 std::string* server_protos) OVERRIDE;
64 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE; 65 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
65 66
66 // SSLSocket implementation. 67 // SSLSocket implementation.
67 virtual int ExportKeyingMaterial(const base::StringPiece& label, 68 virtual int ExportKeyingMaterial(const base::StringPiece& label,
68 bool has_context, 69 bool has_context,
69 const base::StringPiece& context, 70 const base::StringPiece& context,
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 // True if channel ID extension was negotiated. 242 // True if channel ID extension was negotiated.
242 bool channel_id_xtn_negotiated_; 243 bool channel_id_xtn_negotiated_;
243 // The request handle for |server_bound_cert_service_|. 244 // The request handle for |server_bound_cert_service_|.
244 ServerBoundCertService::RequestHandle channel_id_request_handle_; 245 ServerBoundCertService::RequestHandle channel_id_request_handle_;
245 BoundNetLog net_log_; 246 BoundNetLog net_log_;
246 }; 247 };
247 248
248 } // namespace net 249 } // namespace net
249 250
250 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 251 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698