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

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

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed additional arg from GetNextProto (was added in by rebase (?)) and fixed other small bugs. 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_NSS_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
7 7
8 #include <certt.h> 8 #include <certt.h>
9 #include <keyt.h> 9 #include <keyt.h>
10 #include <nspr.h> 10 #include <nspr.h>
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 // behaviour is desired, for performance or compatibility, the current task 61 // behaviour is desired, for performance or compatibility, the current task
62 // runner should be supplied instead. 62 // runner should be supplied instead.
63 SSLClientSocketNSS(base::SequencedTaskRunner* nss_task_runner, 63 SSLClientSocketNSS(base::SequencedTaskRunner* nss_task_runner,
64 scoped_ptr<ClientSocketHandle> transport_socket, 64 scoped_ptr<ClientSocketHandle> transport_socket,
65 const HostPortPair& host_and_port, 65 const HostPortPair& host_and_port,
66 const SSLConfig& ssl_config, 66 const SSLConfig& ssl_config,
67 const SSLClientSocketContext& context); 67 const SSLClientSocketContext& context);
68 virtual ~SSLClientSocketNSS(); 68 virtual ~SSLClientSocketNSS();
69 69
70 // SSLClientSocket implementation. 70 // SSLClientSocket implementation.
71 virtual bool InSessionCache() const OVERRIDE;
72 virtual void SetHandshakeCompletionCallback(
73 const base::Closure& callback) OVERRIDE;
71 virtual void GetSSLCertRequestInfo( 74 virtual void GetSSLCertRequestInfo(
72 SSLCertRequestInfo* cert_request_info) OVERRIDE; 75 SSLCertRequestInfo* cert_request_info) OVERRIDE;
73 virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; 76 virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE;
74 77
75 // SSLSocket implementation. 78 // SSLSocket implementation.
76 virtual int ExportKeyingMaterial(const base::StringPiece& label, 79 virtual int ExportKeyingMaterial(const base::StringPiece& label,
77 bool has_context, 80 bool has_context,
78 const base::StringPiece& context, 81 const base::StringPiece& context,
79 unsigned char* out, 82 unsigned char* out,
80 unsigned int outlen) OVERRIDE; 83 unsigned int outlen) OVERRIDE;
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 // Added the following code Debugging in release mode. 213 // Added the following code Debugging in release mode.
211 mutable base::Lock lock_; 214 mutable base::Lock lock_;
212 // This is mutable so that CalledOnValidThread can set it. 215 // This is mutable so that CalledOnValidThread can set it.
213 // It's guarded by |lock_|. 216 // It's guarded by |lock_|.
214 mutable base::PlatformThreadId valid_thread_id_; 217 mutable base::PlatformThreadId valid_thread_id_;
215 }; 218 };
216 219
217 } // namespace net 220 } // namespace net
218 221
219 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 222 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698