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

Side by Side Diff: net/socket/ssl_client_socket_nss.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_NSS_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <certt.h> 9 #include <certt.h>
10 #include <keyt.h> 10 #include <keyt.h>
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 const SSLConfig& ssl_config, 55 const SSLConfig& ssl_config,
56 SSLHostInfo* ssl_host_info, 56 SSLHostInfo* ssl_host_info,
57 const SSLClientSocketContext& context); 57 const SSLClientSocketContext& context);
58 virtual ~SSLClientSocketNSS(); 58 virtual ~SSLClientSocketNSS();
59 59
60 // SSLClientSocket implementation. 60 // SSLClientSocket implementation.
61 virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE; 61 virtual void GetSSLInfo(SSLInfo* ssl_info) OVERRIDE;
62 virtual void GetSSLCertRequestInfo( 62 virtual void GetSSLCertRequestInfo(
63 SSLCertRequestInfo* cert_request_info) OVERRIDE; 63 SSLCertRequestInfo* cert_request_info) OVERRIDE;
64 virtual int ExportKeyingMaterial(const base::StringPiece& label, 64 virtual int ExportKeyingMaterial(const base::StringPiece& label,
65 bool has_context,
65 const base::StringPiece& context, 66 const base::StringPiece& context,
66 unsigned char *out, 67 unsigned char* out,
67 unsigned int outlen) OVERRIDE; 68 unsigned int outlen) OVERRIDE;
68 virtual NextProtoStatus GetNextProto(std::string* proto, 69 virtual NextProtoStatus GetNextProto(std::string* proto,
69 std::string* server_protos) OVERRIDE; 70 std::string* server_protos) OVERRIDE;
70 71
71 // StreamSocket implementation. 72 // StreamSocket implementation.
72 virtual int Connect(const CompletionCallback& callback) OVERRIDE; 73 virtual int Connect(const CompletionCallback& callback) OVERRIDE;
73 virtual void Disconnect() OVERRIDE; 74 virtual void Disconnect() OVERRIDE;
74 virtual bool IsConnected() const OVERRIDE; 75 virtual bool IsConnected() const OVERRIDE;
75 virtual bool IsConnectedAndIdle() const OVERRIDE; 76 virtual bool IsConnectedAndIdle() const OVERRIDE;
76 virtual int GetPeerAddress(AddressList* address) const OVERRIDE; 77 virtual int GetPeerAddress(AddressList* address) const OVERRIDE;
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 // Added the following code Debugging in release mode. 310 // Added the following code Debugging in release mode.
310 mutable base::Lock lock_; 311 mutable base::Lock lock_;
311 // This is mutable so that CalledOnValidThread can set it. 312 // This is mutable so that CalledOnValidThread can set it.
312 // It's guarded by |lock_|. 313 // It's guarded by |lock_|.
313 mutable base::PlatformThreadId valid_thread_id_; 314 mutable base::PlatformThreadId valid_thread_id_;
314 }; 315 };
315 316
316 } // namespace net 317 } // namespace net
317 318
318 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_ 319 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698