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

Side by Side Diff: net/socket/ssl_client_socket_openssl.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_OPENSSL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 } 47 }
48 48
49 // Callback from the SSL layer that indicates the remote server is requesting 49 // Callback from the SSL layer that indicates the remote server is requesting
50 // a certificate for this client. 50 // a certificate for this client.
51 int ClientCertRequestCallback(SSL* ssl, X509** x509, EVP_PKEY** pkey); 51 int ClientCertRequestCallback(SSL* ssl, X509** x509, EVP_PKEY** pkey);
52 52
53 // Callback from the SSL layer to check which NPN protocol we are supporting 53 // Callback from the SSL layer to check which NPN protocol we are supporting
54 int SelectNextProtoCallback(unsigned char** out, unsigned char* outlen, 54 int SelectNextProtoCallback(unsigned char** out, unsigned char* outlen,
55 const unsigned char* in, unsigned int inlen); 55 const unsigned char* in, unsigned int inlen);
56 56
57 // SSLClientSocket implementation. 57 // SSLSocket implementation.
58 virtual void GetSSLCertRequestInfo(
59 SSLCertRequestInfo* cert_request_info) OVERRIDE;
60 virtual int ExportKeyingMaterial(const base::StringPiece& label, 58 virtual int ExportKeyingMaterial(const base::StringPiece& label,
61 bool has_context, 59 bool has_context,
62 const base::StringPiece& context, 60 const base::StringPiece& context,
63 unsigned char* out, 61 unsigned char* out,
64 unsigned int outlen) OVERRIDE; 62 unsigned int outlen) OVERRIDE;
63 virtual int GetTlsUniqueChannelBinding(unsigned char* out,
64 unsigned int *outlen,
65 unsigned int outlen_max) OVERRIDE;
66
67 // SSLClientSocket implementation.
68 virtual void GetSSLCertRequestInfo(
69 SSLCertRequestInfo* cert_request_info) OVERRIDE;
65 virtual NextProtoStatus GetNextProto(std::string* proto, 70 virtual NextProtoStatus GetNextProto(std::string* proto,
66 std::string* server_protos) OVERRIDE; 71 std::string* server_protos) OVERRIDE;
67 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE; 72 virtual ServerBoundCertService* GetServerBoundCertService() const OVERRIDE;
68 73
69 // StreamSocket implementation. 74 // StreamSocket implementation.
70 virtual int Connect(const CompletionCallback& callback) OVERRIDE; 75 virtual int Connect(const CompletionCallback& callback) OVERRIDE;
71 virtual void Disconnect() OVERRIDE; 76 virtual void Disconnect() OVERRIDE;
72 virtual bool IsConnected() const OVERRIDE; 77 virtual bool IsConnected() const OVERRIDE;
73 virtual bool IsConnectedAndIdle() const OVERRIDE; 78 virtual bool IsConnectedAndIdle() const OVERRIDE;
74 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE; 79 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 State next_handshake_state_; 179 State next_handshake_state_;
175 NextProtoStatus npn_status_; 180 NextProtoStatus npn_status_;
176 std::string npn_proto_; 181 std::string npn_proto_;
177 std::string server_protos_; 182 std::string server_protos_;
178 BoundNetLog net_log_; 183 BoundNetLog net_log_;
179 }; 184 };
180 185
181 } // namespace net 186 } // namespace net
182 187
183 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 188 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698