Add a boolean |had_context| argument to the TLS ExportKeyingMaterial

net/socket/ssl_client_socket_openssl.cc

 // Copyright (c) 2012 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.
 
 // OpenSSL binding for SSLClientSocket. The class layout and general principle
 // of operation is derived from SSLClientSocketNSS.
 
 #include "net/socket/ssl_client_socket_openssl.h"
 
 #include <openssl/ssl.h>
@@ skipping 606 matching lines @@
       << SSLConnectionStatusToVersion(ssl_info->connection_status);
 }
 
 void SSLClientSocketOpenSSL::GetSSLCertRequestInfo(
     SSLCertRequestInfo* cert_request_info) {
   cert_request_info->host_and_port = host_and_port_.ToString();
   cert_request_info->client_certs = client_certs_;
 }
 
 int SSLClientSocketOpenSSL::ExportKeyingMaterial(
-    const base::StringPiece& label, const base::StringPiece& context,
+    const base::StringPiece& label,
+    bool has_context, const base::StringPiece& context,
     unsigned char *out, unsigned int outlen) {

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

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

   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   int rv = SSL_export_keying_material(
       ssl_, out, outlen, const_cast<char*>(label.data()),
       label.size(),
       reinterpret_cast<unsigned char*>(const_cast<char*>(context.data())),
       context.length(),
       context.length() > 0);
 
   if (rv != 1) {
@@ skipping 657 matching lines @@
     net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv,
                                   user_write_buf_->data());
     return rv;
   }
 
   int err = SSL_get_error(ssl_, rv);
   return MapOpenSSLError(err, err_tracer);
 }
 
 }  // namespace net