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

Side by Side Diff: net/socket/ssl_client_socket_win.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_openssl.cc ('k') | net/socket/ssl_client_socket_win.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_WIN_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_WIN_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_WIN_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_WIN_H_
7 7
8 #define SECURITY_WIN32 // Needs to be defined before including security.h 8 #define SECURITY_WIN32 // Needs to be defined before including security.h
9 9
10 #include <windows.h> 10 #include <windows.h>
(...skipping 28 matching lines...) Expand all
39 // will be populated with |host_and_port|. |ssl_config| specifies 39 // will be populated with |host_and_port|. |ssl_config| specifies
40 // the SSL settings. 40 // the SSL settings.
41 SSLClientSocketWin(ClientSocketHandle* transport_socket, 41 SSLClientSocketWin(ClientSocketHandle* transport_socket,
42 const HostPortPair& host_and_port, 42 const HostPortPair& host_and_port,
43 const SSLConfig& ssl_config, 43 const SSLConfig& ssl_config,
44 const SSLClientSocketContext& context); 44 const SSLClientSocketContext& context);
45 ~SSLClientSocketWin(); 45 ~SSLClientSocketWin();
46 46
47 // SSLClientSocket implementation. 47 // SSLClientSocket implementation.
48 virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info); 48 virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
49 virtual NextProtoStatus GetNextProto(std::string* proto,
50 std::string* server_protos);
51 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
52
53 // SSLSocket implementation.
49 virtual int ExportKeyingMaterial(const base::StringPiece& label, 54 virtual int ExportKeyingMaterial(const base::StringPiece& label,
50 bool has_context, 55 bool has_context,
51 const base::StringPiece& context, 56 const base::StringPiece& context,
52 unsigned char* out, 57 unsigned char* out,
53 unsigned int outlen); 58 unsigned int outlen);
54 virtual NextProtoStatus GetNextProto(std::string* proto, 59 virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE;
55 std::string* server_protos);
56 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
57 60
58 // StreamSocket implementation. 61 // StreamSocket implementation.
59 virtual int Connect(const CompletionCallback& callback) OVERRIDE; 62 virtual int Connect(const CompletionCallback& callback) OVERRIDE;
60 virtual void Disconnect() OVERRIDE; 63 virtual void Disconnect() OVERRIDE;
61 virtual bool IsConnected() const OVERRIDE; 64 virtual bool IsConnected() const OVERRIDE;
62 virtual bool IsConnectedAndIdle() const OVERRIDE; 65 virtual bool IsConnectedAndIdle() const OVERRIDE;
63 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; 66 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
64 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; 67 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
65 virtual const BoundNetLog& NetLog() const OVERRIDE{ return net_log_; } 68 virtual const BoundNetLog& NetLog() const OVERRIDE{ return net_log_; }
66 virtual void SetSubresourceSpeculation() OVERRIDE; 69 virtual void SetSubresourceSpeculation() OVERRIDE;
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 204
202 // True when the decrypter needs more data in order to decrypt. 205 // True when the decrypter needs more data in order to decrypt.
203 bool need_more_data_; 206 bool need_more_data_;
204 207
205 BoundNetLog net_log_; 208 BoundNetLog net_log_;
206 }; 209 };
207 210
208 } // namespace net 211 } // namespace net
209 212
210 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_WIN_H_ 213 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_WIN_H_
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.cc ('k') | net/socket/ssl_client_socket_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698