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

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

Issue 9663043: Add a boolean |had_context| argument to the TLS ExportKeyingMaterial (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make suggested changes, add patch file Created 8 years, 9 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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 int ClientCertRequestCallback(SSL* ssl, X509** x509, EVP_PKEY** pkey); 52 int ClientCertRequestCallback(SSL* ssl, X509** x509, EVP_PKEY** pkey);
53 53
54 // Callback from the SSL layer to check which NPN protocol we are supporting 54 // Callback from the SSL layer to check which NPN protocol we are supporting
55 int SelectNextProtoCallback(unsigned char** out, unsigned char* outlen, 55 int SelectNextProtoCallback(unsigned char** out, unsigned char* outlen,
56 const unsigned char* in, unsigned int inlen); 56 const unsigned char* in, unsigned int inlen);
57 57
58 // SSLClientSocket implementation. 58 // SSLClientSocket implementation.
59 virtual void GetSSLInfo(SSLInfo* ssl_info); 59 virtual void GetSSLInfo(SSLInfo* ssl_info);
60 virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info); 60 virtual void GetSSLCertRequestInfo(SSLCertRequestInfo* cert_request_info);
61 virtual int ExportKeyingMaterial(const base::StringPiece& label, 61 virtual int ExportKeyingMaterial(const base::StringPiece& label,
62 bool has_context,
62 const base::StringPiece& context, 63 const base::StringPiece& context,
63 unsigned char *out, 64 unsigned char* out,
64 unsigned int outlen); 65 unsigned int outlen);
65 virtual NextProtoStatus GetNextProto(std::string* proto, 66 virtual NextProtoStatus GetNextProto(std::string* proto,
66 std::string* server_protos); 67 std::string* server_protos);
67 virtual OriginBoundCertService* GetOriginBoundCertService() const; 68 virtual OriginBoundCertService* GetOriginBoundCertService() const;
68 69
69 // StreamSocket implementation. 70 // StreamSocket implementation.
70 virtual int Connect(const CompletionCallback& callback); 71 virtual int Connect(const CompletionCallback& callback);
71 virtual void Disconnect(); 72 virtual void Disconnect();
72 virtual bool IsConnected() const; 73 virtual bool IsConnected() const;
73 virtual bool IsConnectedAndIdle() const; 74 virtual bool IsConnectedAndIdle() const;
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 State next_handshake_state_; 173 State next_handshake_state_;
173 NextProtoStatus npn_status_; 174 NextProtoStatus npn_status_;
174 std::string npn_proto_; 175 std::string npn_proto_;
175 std::string server_protos_; 176 std::string server_protos_;
176 BoundNetLog net_log_; 177 BoundNetLog net_log_;
177 }; 178 };
178 179
179 } // namespace net 180 } // namespace net
180 181
181 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_ 182 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_OPENSSL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698