Land Recent QUIC Changes

net/quic/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/crypto/crypto_utils.h"
 
 #include "crypto/hkdf.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/quic_decrypter.h"
@@ skipping 54 matching lines @@
 }
 
 void CryptoUtils::GenerateNonce(QuicTime::Delta now,
                                 QuicRandom* random_generator,
                                 StringPiece orbit,
                                 string* nonce) {
   // a 4-byte timestamp + 28 random bytes.
   nonce->reserve(kNonceSize);
   nonce->resize(kNonceSize);
   uint32 gmt_unix_time = now.ToSeconds();
-  memcpy(&(*nonce)[0], &gmt_unix_time, sizeof(gmt_unix_time));
+  // The time in the nonce must be encoded in big-endian because the
+  // strike-register depends on the nonces being ordered by time.
+  (*nonce)[0] = static_cast<char>(gmt_unix_time >> 24);
+  (*nonce)[1] = static_cast<char>(gmt_unix_time >> 16);
+  (*nonce)[2] = static_cast<char>(gmt_unix_time >> 8);
+  (*nonce)[3] = static_cast<char>(gmt_unix_time);
 
   size_t bytes_written = sizeof(gmt_unix_time);
   if (orbit.size() == 8) {
     memcpy(&(*nonce)[bytes_written], orbit.data(), orbit.size());
     bytes_written += orbit.size();
   }
   random_generator->RandBytes(&(*nonce)[bytes_written],
                               kNonceSize - bytes_written);
 }
 
@@ skipping 22 matching lines @@
     params->decrypter->SetNoncePrefix(hkdf.client_write_iv());
   } else {
     params->encrypter->SetKey(hkdf.client_write_key());
     params->encrypter->SetNoncePrefix(hkdf.client_write_iv());
     params->decrypter->SetKey(hkdf.server_write_key());
     params->decrypter->SetNoncePrefix(hkdf.server_write_iv());
   }
 }
 
 }  // namespace net