diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 00:20:58 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-15 00:20:58 +0000 |
| commit | 1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a (patch) | |
| tree | d804ca496db0952db185663f12193c7108854573 /remoting | |
| parent | b518852c1a1ccf23fd3ee12d49895009cb8a5aa0 (diff) | |
| download | chromium_src-1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a.zip chromium_src-1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a.tar.gz chromium_src-1bc6f5e2827bbf1fe571d2b6f085ceff23644e1a.tar.bz2 | |
Add a boolean |has_context| argument to the TLS ExportKeyingMaterial
method to support both nonexistent context and zero-length context.
R=agl@chromium.org,rsleevi@chromium.org
BUG=none
TEST=existing unit tests
Review URL: http://codereview.chromium.org/9663043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/protocol/auth_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/protocol/auth_util.cc b/remoting/protocol/auth_util.cc index 281dabc..841664c 100644 --- a/remoting/protocol/auth_util.cc +++ b/remoting/protocol/auth_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -47,7 +47,7 @@ std::string GetAuthBytes(net::SSLSocket* socket, // Get keying material from SSL. unsigned char key_material[kAuthDigestLength]; int export_result = socket->ExportKeyingMaterial( - label, "", key_material, kAuthDigestLength); + label, false, "", key_material, kAuthDigestLength); if (export_result != net::OK) { LOG(ERROR) << "Error fetching keying material: " << export_result; return std::string(); |