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

Side by Side Diff: net/socket/ssl_server_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) 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_SERVER_SOCKET_NSS_H_ 5 #ifndef NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_
6 #define NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_ 6 #define NET_SOCKET_SSL_SERVER_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 16 matching lines...) Expand all
27 // parameters are used. 27 // parameters are used.
28 SSLServerSocketNSS(StreamSocket* socket, 28 SSLServerSocketNSS(StreamSocket* socket,
29 scoped_refptr<X509Certificate> certificate, 29 scoped_refptr<X509Certificate> certificate,
30 crypto::RSAPrivateKey* key, 30 crypto::RSAPrivateKey* key,
31 const SSLConfig& ssl_config); 31 const SSLConfig& ssl_config);
32 virtual ~SSLServerSocketNSS(); 32 virtual ~SSLServerSocketNSS();
33 33
34 // SSLServerSocket interface. 34 // SSLServerSocket interface.
35 virtual int Handshake(const CompletionCallback& callback) OVERRIDE; 35 virtual int Handshake(const CompletionCallback& callback) OVERRIDE;
36 virtual int ExportKeyingMaterial(const base::StringPiece& label, 36 virtual int ExportKeyingMaterial(const base::StringPiece& label,
37 bool has_context,
37 const base::StringPiece& context, 38 const base::StringPiece& context,
38 unsigned char *out, 39 unsigned char* out,
39 unsigned int outlen) OVERRIDE; 40 unsigned int outlen) OVERRIDE;
40 41
41 // Socket interface (via StreamSocket). 42 // Socket interface (via StreamSocket).
42 virtual int Read(IOBuffer* buf, int buf_len, 43 virtual int Read(IOBuffer* buf, int buf_len,
43 const CompletionCallback& callback) OVERRIDE; 44 const CompletionCallback& callback) OVERRIDE;
44 virtual int Write(IOBuffer* buf, int buf_len, 45 virtual int Write(IOBuffer* buf, int buf_len,
45 const CompletionCallback& callback) OVERRIDE; 46 const CompletionCallback& callback) OVERRIDE;
46 virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; 47 virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
47 virtual bool SetSendBufferSize(int32 size) OVERRIDE; 48 virtual bool SetSendBufferSize(int32 size) OVERRIDE;
48 49
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 138
138 State next_handshake_state_; 139 State next_handshake_state_;
139 bool completed_handshake_; 140 bool completed_handshake_;
140 141
141 DISALLOW_COPY_AND_ASSIGN(SSLServerSocketNSS); 142 DISALLOW_COPY_AND_ASSIGN(SSLServerSocketNSS);
142 }; 143 };
143 144
144 } // namespace net 145 } // namespace net
145 146
146 #endif // NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_ 147 #endif // NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698