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

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: 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/socket_test_util.cc ('k') | net/socket/ssl_client_socket_mac.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_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 24 matching lines...) Expand all
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 // SSLClientSocket implementation.
43 virtual void GetSSLCertRequestInfo( 43 virtual void GetSSLCertRequestInfo(
44 SSLCertRequestInfo* cert_request_info) OVERRIDE; 44 SSLCertRequestInfo* cert_request_info) OVERRIDE;
45 virtual NextProtoStatus GetNextProto(std::string* proto,
46 std::string* server_protos) OVERRIDE;
47 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
48
49 // SSLSocket implementation.
45 virtual int ExportKeyingMaterial(const base::StringPiece& label, 50 virtual int ExportKeyingMaterial(const base::StringPiece& label,
46 bool has_context, 51 bool has_context,
47 const base::StringPiece& context, 52 const base::StringPiece& context,
48 unsigned char* out, 53 unsigned char* out,
49 unsigned int outlen) OVERRIDE; 54 unsigned int outlen) OVERRIDE;
50 virtual NextProtoStatus GetNextProto(std::string* proto, 55 virtual int GetTLSUniqueChannelBinding(std::string* out) OVERRIDE;
51 std::string* server_protos) OVERRIDE;
52 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
53 56
54 // StreamSocket implementation. 57 // StreamSocket implementation.
55 virtual int Connect(const CompletionCallback& callback) OVERRIDE; 58 virtual int Connect(const CompletionCallback& callback) OVERRIDE;
56 virtual void Disconnect() OVERRIDE; 59 virtual void Disconnect() OVERRIDE;
57 virtual bool IsConnected() const OVERRIDE; 60 virtual bool IsConnected() const OVERRIDE;
58 virtual bool IsConnectedAndIdle() const OVERRIDE; 61 virtual bool IsConnectedAndIdle() const OVERRIDE;
59 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; 62 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
60 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; 63 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
61 virtual const BoundNetLog& NetLog() const OVERRIDE; 64 virtual const BoundNetLog& NetLog() const OVERRIDE;
62 virtual void SetSubresourceSpeculation() OVERRIDE; 65 virtual void SetSubresourceSpeculation() OVERRIDE;
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // These are the IOBuffers used for operations on the underlying transport. 175 // These are the IOBuffers used for operations on the underlying transport.
173 scoped_refptr<IOBuffer> read_io_buf_; 176 scoped_refptr<IOBuffer> read_io_buf_;
174 scoped_refptr<IOBuffer> write_io_buf_; 177 scoped_refptr<IOBuffer> write_io_buf_;
175 178
176 BoundNetLog net_log_; 179 BoundNetLog net_log_;
177 }; 180 };
178 181
179 } // namespace net 182 } // namespace net
180 183
181 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_ 184 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_MAC_H_
OLDNEW
« no previous file with comments | « net/socket/socket_test_util.cc ('k') | net/socket/ssl_client_socket_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698