Add a boolean |had_context| argument to the TLS ExportKeyingMaterial

remoting/protocol/auth_util.cc

 // 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.
 
 #include "remoting/protocol/auth_util.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "crypto/hmac.h"
@@ skipping 29 matching lines @@
   return expected_token == auth_token;
 }
 
 // static
 std::string GetAuthBytes(net::SSLSocket* socket,
                          const base::StringPiece& label,
                          const base::StringPiece& shared_secret) {
   // Get keying material from SSL.
   unsigned char key_material[kAuthDigestLength];
   int export_result = socket->ExportKeyingMaterial(
-      label, "", key_material, kAuthDigestLength);
+      label, false, "", key_material, kAuthDigestLength);

[wtc, 2012/03/14 03:35:46]

Here we're using no context (""), so the new has_context
argument should be false.

   if (export_result != net::OK) {
     LOG(ERROR) << "Error fetching keying material: " << export_result;
     return std::string();
   }
 
   // Generate auth digest based on the keying material and shared secret.
   crypto::HMAC response(crypto::HMAC::SHA256);
   if (!response.Init(key_material, kAuthDigestLength)) {
     NOTREACHED() << "HMAC::Init failed";
     return std::string();
   }
   unsigned char out_bytes[kAuthDigestLength];
   if (!response.Sign(shared_secret, out_bytes, kAuthDigestLength)) {
     NOTREACHED() << "HMAC::Sign failed";
     return std::string();
   }
 
   return std::string(out_bytes, out_bytes + kAuthDigestLength);
 }
 
 }  // namespace protocol
 }  // namespace remoting