Land Recent QUIC changes

net/quic/crypto/null_encrypter.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/crypto/null_encrypter.h"
 #include "net/quic/quic_data_writer.h"
 #include "net/quic/quic_utils.h"
 
 using base::StringPiece;
 using std::string;
@@ skipping 11 matching lines @@
 }
 
 bool NullEncrypter::Encrypt(
     StringPiece /*nonce*/,
     StringPiece associated_data,
     StringPiece plaintext,
     unsigned char* output) {
   string buffer = associated_data.as_string();
   plaintext.AppendToString(&buffer);
   uint128 hash = QuicUtils::FNV1a_128_Hash(buffer.data(), buffer.length());
-  memcpy(output, &hash, sizeof(hash));
+  QuicUtils::SerializeUint128(hash, output);
   memcpy(output + sizeof(hash), plaintext.data(), plaintext.size());
   return true;
 }
 
 QuicData* NullEncrypter::EncryptPacket(
     QuicPacketSequenceNumber /*sequence_number*/,
     StringPiece associated_data,
     StringPiece plaintext) {
   const size_t len = plaintext.size() + sizeof(uint128);
   uint8* buffer = new uint8[len];
@@ skipping 19 matching lines @@
 
 StringPiece NullEncrypter::GetKey() const {
   return StringPiece();
 }
 
 StringPiece NullEncrypter::GetNoncePrefix() const {
   return StringPiece();
 }
 
 }  // namespace net