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

Side by Side Diff: net/socket/ssl_socket.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: 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_SOCKET_H_ 5 #ifndef NET_SOCKET_SSL_SOCKET_H_
6 #define NET_SOCKET_SSL_SOCKET_H_ 6 #define NET_SOCKET_SSL_SOCKET_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/string_piece.h" 9 #include "base/string_piece.h"
10 #include "net/socket/stream_socket.h" 10 #include "net/socket/stream_socket.h"
11 11
12 namespace net { 12 namespace net {
13 13
14 // SSLSocket interface defines method that are common between client 14 // SSLSocket interface defines method that are common between client
15 // and server SSL sockets. 15 // and server SSL sockets.
16 class NET_EXPORT SSLSocket : public StreamSocket { 16 class NET_EXPORT SSLSocket : public StreamSocket {
17 public: 17 public:
18 virtual ~SSLSocket() {} 18 virtual ~SSLSocket() {}
19 19
20 // Exports data derived from the SSL master-secret (see RFC 5705). 20 // Exports data derived from the SSL master-secret (see RFC 5705).
21 // The call will fail with an error if the socket is not connected, or the 21 // If |has_context| is false, uses the no-context construction from the
22 // SSL implementation does not support the operation. 22 // RFC and |context| is ignored. The call will fail with an error if
23 // the socket is not connected, or the SSL implementation does not
Ryan Sleevi 2012/03/10 04:23:31 nit: No comma needed here. If you do leave it, the
24 // support the operation.
23 virtual int ExportKeyingMaterial(const base::StringPiece& label, 25 virtual int ExportKeyingMaterial(const base::StringPiece& label,
26 bool has_context,
24 const base::StringPiece& context, 27 const base::StringPiece& context,
25 unsigned char *out, 28 unsigned char *out,
26 unsigned int outlen) = 0; 29 unsigned int outlen) = 0;
27 }; 30 };
28 31
29 } // namespace net 32 } // namespace net
30 33
31 #endif // NET_SOCKET_SSL_SOCKET_H_ 34 #endif // NET_SOCKET_SSL_SOCKET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698