Add a boolean |had_context| argument to the TLS ExportKeyingMaterial

net/socket/ssl_server_socket_nss.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_
 #define NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_
 #pragma once
 
 #include <certt.h>
 #include <keyt.h>
@@ skipping 16 matching lines @@
   // parameters are used.
   SSLServerSocketNSS(StreamSocket* socket,
                      scoped_refptr<X509Certificate> certificate,
                      crypto::RSAPrivateKey* key,
                      const SSLConfig& ssl_config);
   virtual ~SSLServerSocketNSS();
 
   // SSLServerSocket interface.
   virtual int Handshake(const CompletionCallback& callback) OVERRIDE;
   virtual int ExportKeyingMaterial(const base::StringPiece& label,
+                                   bool has_context,
                                    const base::StringPiece& context,
                                    unsigned char *out,

[Ryan Sleevi, 2012/03/10 04:23:31]

nit: "unsigned char *" -> "unsigned char* "

                                    unsigned int outlen) OVERRIDE;
 
   // Socket interface (via StreamSocket).
   virtual int Read(IOBuffer* buf, int buf_len,
                    const CompletionCallback& callback) OVERRIDE;
   virtual int Write(IOBuffer* buf, int buf_len,
                     const CompletionCallback& callback) OVERRIDE;
   virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
   virtual bool SetSendBufferSize(int32 size) OVERRIDE;
 
@@ skipping 88 matching lines @@
 
   State next_handshake_state_;
   bool completed_handshake_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLServerSocketNSS);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_SERVER_SOCKET_NSS_H_