Landing Recent QUIC changes until Mon May 8 21:42:46 2017 +0000

net/quic/core/crypto/crypto_utils.cc

 // Copyright (c) 2013 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/quic/core/crypto/crypto_utils.h"
 
 #include <memory>
 
 #include "crypto/hkdf.h"
 #include "net/quic/core/crypto/crypto_handshake.h"
@@ skipping 119 matching lines @@
           !crypters->encrypter->SetNoncePrefix(nonce_prefix)) {
         return false;
       }
       break;
     }
     default:
       DCHECK(false);
   }
 
   if (subkey_secret != nullptr) {
-    hkdf.subkey_secret().CopyToString(subkey_secret);
+    *subkey_secret = string(hkdf.subkey_secret());
   }
 
   return true;
 }
 
 // static
 bool CryptoUtils::ExportKeyingMaterial(QuicStringPiece subkey_secret,
                                        QuicStringPiece label,
                                        QuicStringPiece context,
                                        size_t result_len,
@@ skipping 10 matching lines @@
     return false;
   }
   uint32_t context_length = static_cast<uint32_t>(context.length());
   string info = label.as_string();
   info.push_back('\0');
   info.append(reinterpret_cast<char*>(&context_length), sizeof(context_length));
   info.append(context.data(), context.length());
 
   crypto::HKDF hkdf(subkey_secret, QuicStringPiece() /* no salt */, info,
                     result_len, 0 /* no fixed IV */, 0 /* no subkey secret */);
-  hkdf.client_write_key().CopyToString(result);
+  *result = string(hkdf.client_write_key());
   return true;
 }
 
 // static
 uint64_t CryptoUtils::ComputeLeafCertHash(QuicStringPiece cert) {
   return QuicUtils::FNV1a_64_Hash(cert);
 }
 
 QuicErrorCode CryptoUtils::ValidateServerHello(
     const CryptoHandshakeMessage& server_hello,
@@ skipping 113 matching lines @@
                                        string* output,
                                        Perspective perspective) {
   const QuicData& serialized = message.GetSerialized(perspective);
   uint8_t digest[SHA256_DIGEST_LENGTH];
   SHA256(reinterpret_cast<const uint8_t*>(serialized.data()),
          serialized.length(), digest);
   output->assign(reinterpret_cast<const char*>(digest), sizeof(digest));
 }
 
 }  // namespace net