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

Side by Side Diff: net/socket/ssl_client_socket_mac.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: 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
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_MAC_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_
7 7
8 #include <Security/Security.h> 8 #include <Security/Security.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 21 matching lines...) Expand all
32 // in the server's certificate during the SSL handshake. If SSL client 32 // in the server's certificate during the SSL handshake. If SSL client
33 // authentication is requested, the host_and_port field of SSLCertRequestInfo 33 // authentication is requested, the host_and_port field of SSLCertRequestInfo
34 // will be populated with |host_and_port|. |ssl_config| specifies 34 // will be populated with |host_and_port|. |ssl_config| specifies
35 // the SSL settings. 35 // the SSL settings.
36 SSLClientSocketMac(ClientSocketHandle* transport_socket, 36 SSLClientSocketMac(ClientSocketHandle* transport_socket,
37 const HostPortPair& host_and_port, 37 const HostPortPair& host_and_port,
38 const SSLConfig& ssl_config, 38 const SSLConfig& ssl_config,
39 const SSLClientSocketContext& context); 39 const SSLClientSocketContext& context);
40 virtual ~SSLClientSocketMac(); 40 virtual ~SSLClientSocketMac();
41 41
42 // SSLClientSocket implementation. 42 // SSLSocket implementation.
43 virtual void GetSSLCertRequestInfo(
44 SSLCertRequestInfo* cert_request_info) OVERRIDE;
45 virtual int ExportKeyingMaterial(const base::StringPiece& label, 43 virtual int ExportKeyingMaterial(const base::StringPiece& label,
46 bool has_context, 44 bool has_context,
47 const base::StringPiece& context, 45 const base::StringPiece& context,
48 unsigned char* out, 46 unsigned char* out,
49 unsigned int outlen) OVERRIDE; 47 unsigned int outlen) OVERRIDE;
48 virtual int GetTlsUniqueChannelBinding(unsigned char* out,
49 unsigned int *outlen,
50 unsigned int outlen_max) OVERRIDE;
51
52 // SSLClientSocket implementation.
53 virtual void GetSSLCertRequestInfo(
54 SSLCertRequestInfo* cert_request_info) OVERRIDE;
50 virtual NextProtoStatus GetNextProto(std::string* proto, 55 virtual NextProtoStatus GetNextProto(std::string* proto,
51 std::string* server_protos) OVERRIDE; 56 std::string* server_protos) OVERRIDE;
52 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE; 57 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
53 58
54 // StreamSocket implementation. 59 // StreamSocket implementation.
55 virtual int Connect(const CompletionCallback& callback) OVERRIDE; 60 virtual int Connect(const CompletionCallback& callback) OVERRIDE;
56 virtual void Disconnect() OVERRIDE; 61 virtual void Disconnect() OVERRIDE;
57 virtual bool IsConnected() const OVERRIDE; 62 virtual bool IsConnected() const OVERRIDE;
58 virtual bool IsConnectedAndIdle() const OVERRIDE; 63 virtual bool IsConnectedAndIdle() const OVERRIDE;
59 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; 64 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // These are the IOBuffers used for operations on the underlying transport. 177 // These are the IOBuffers used for operations on the underlying transport.
173 scoped_refptr<IOBuffer> read_io_buf_; 178 scoped_refptr<IOBuffer> read_io_buf_;
174 scoped_refptr<IOBuffer> write_io_buf_; 179 scoped_refptr<IOBuffer> write_io_buf_;
175 180
176 BoundNetLog net_log_; 181 BoundNetLog net_log_;
177 }; 182 };
178 183
179 } // namespace net 184 } // namespace net
180 185
181 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_ 186 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698