Add a boolean |had_context| argument to the TLS ExportKeyingMaterial

net/socket/ssl_client_socket_mac.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.
 
 #include "net/socket/ssl_client_socket_mac.h"
 
 #include <CoreServices/CoreServices.h>
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/types.h>
@@ skipping 760 matching lines @@
   // TODO(rch):  we should consider passing a host-port pair as the first
   // argument to X509Certificate::GetSSLClientCertificates.
   X509Certificate::GetSSLClientCertificates(host_and_port_.host(),
                                             valid_issuers,
                                             &cert_request_info->client_certs);
   VLOG(1) << "Asking user to choose between "
           << cert_request_info->client_certs.size() << " client certs...";
 }
 
 int SSLClientSocketMac::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) {
   return ERR_NOT_IMPLEMENTED;
 }
 
 SSLClientSocket::NextProtoStatus
 SSLClientSocketMac::GetNextProto(std::string* proto,
                                  std::string* server_protos) {
   proto->clear();
   server_protos->clear();
   return kNextProtoUnsupported;
@@ skipping 635 matching lines @@
   if (rv < 0 && rv != ERR_IO_PENDING) {
     us->write_io_buf_ = NULL;
     return OSStatusFromNetError(rv);
   }
 
   // always lie to our caller
   return noErr;
 }
 
 }  // namespace net