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

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

Issue 10823084: Add a new GetTlsUniqueChannelBinding method to SSLSocket, and implement nss version. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix typos in _win and _mac. Created 8 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 | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_mac.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 SSLClientSocketNSS(base::SequencedTaskRunner* nss_task_runner, 61 SSLClientSocketNSS(base::SequencedTaskRunner* nss_task_runner,
62 ClientSocketHandle* transport_socket, 62 ClientSocketHandle* transport_socket,
63 const HostPortPair& host_and_port, 63 const HostPortPair& host_and_port,
64 const SSLConfig& ssl_config, 64 const SSLConfig& ssl_config,
65 const SSLClientSocketContext& context); 65 const SSLClientSocketContext& context);
66 virtual ~SSLClientSocketNSS(); 66 virtual ~SSLClientSocketNSS();
67 67
68 // SSLClientSocket implementation. 68 // SSLClientSocket implementation.
69 virtual void GetSSLCertRequestInfo( 69 virtual void GetSSLCertRequestInfo(
70 SSLCertRequestInfo* cert_request_info) OVERRIDE; 70 SSLCertRequestInfo* cert_request_info) OVERRIDE;
71 virtual NextProtoStatus GetNextProto(std::string* proto,
72 std::string* server_protos) OVERRIDE;
73
74 // SSLSocket implementation.
71 virtual int ExportKeyingMaterial(const base::StringPiece& label, 75 virtual int ExportKeyingMaterial(const base::StringPiece& label,
72 bool has_context, 76 bool has_context,
73 const base::StringPiece& context, 77 const base::StringPiece& context,
74 unsigned char* out, 78 unsigned char* out,
75 unsigned int outlen) OVERRIDE; 79 unsigned int outlen) OVERRIDE;
76 virtual NextProtoStatus GetNextProto(std::string* proto, 80 virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE;
77 std::string* server_protos) OVERRIDE;
78 81
79 // StreamSocket implementation. 82 // StreamSocket implementation.
80 virtual int Connect(const CompletionCallback& callback) OVERRIDE; 83 virtual int Connect(const CompletionCallback& callback) OVERRIDE;
81 virtual void Disconnect() OVERRIDE; 84 virtual void Disconnect() OVERRIDE;
82 virtual bool IsConnected() const OVERRIDE; 85 virtual bool IsConnected() const OVERRIDE;
83 virtual bool IsConnectedAndIdle() const OVERRIDE; 86 virtual bool IsConnectedAndIdle() const OVERRIDE;
84 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; 87 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
85 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; 88 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
86 virtual const BoundNetLog& NetLog() const OVERRIDE; 89 virtual const BoundNetLog& NetLog() const OVERRIDE;
87 virtual void SetSubresourceSpeculation() OVERRIDE; 90 virtual void SetSubresourceSpeculation() OVERRIDE;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 // Added the following code Debugging in release mode. 191 // Added the following code Debugging in release mode.
189 mutable base::Lock lock_; 192 mutable base::Lock lock_;
190 // This is mutable so that CalledOnValidThread can set it. 193 // This is mutable so that CalledOnValidThread can set it.
191 // It's guarded by |lock_|. 194 // It's guarded by |lock_|.
192 mutable base::PlatformThreadId valid_thread_id_; 195 mutable base::PlatformThreadId valid_thread_id_;
193 }; 196 };
194 197
195 } // namespace net 198 } // namespace net
196 199
197 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 200 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_mac.cc ('k') | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698