Landing Recent QUIC changes until Sat Sep 10 00:32:41

net/quic/core/crypto/quic_decrypter.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/quic/core/crypto/quic_decrypter.h"
 
 #include "crypto/hkdf.h"
 #include "net/quic/core/crypto/aes_128_gcm_12_decrypter.h"
 #include "net/quic/core/crypto/chacha20_poly1305_decrypter.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
@@ skipping 15 matching lines @@
       return new NullDecrypter();
     default:
       LOG(FATAL) << "Unsupported algorithm: " << algorithm;
       return nullptr;
   }
 }
 
 // static
 void QuicDecrypter::DiversifyPreliminaryKey(StringPiece preliminary_key,
                                             StringPiece nonce_prefix,
-                                            DiversificationNonce nonce,
+                                            const DiversificationNonce& nonce,
                                             size_t key_size,
                                             size_t nonce_prefix_size,
                                             string* out_key,
                                             string* out_nonce_prefix) {
   crypto::HKDF hkdf(preliminary_key.as_string() + nonce_prefix.as_string(),
-                    StringPiece(nonce, kDiversificationNonceSize),
+                    StringPiece(nonce.data(), nonce.size()),
                     "QUIC key diversification", 0, key_size, 0,
                     nonce_prefix_size, 0);
   *out_key = hkdf.server_write_key().as_string();
   *out_nonce_prefix = hkdf.server_write_iv().as_string();
 }
 
 }  // namespace net