Landing Recent QUIC changes until 01/28/2016 18:41 UTC

net/quic/crypto/aead_base_encrypter_openssl.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/aead_base_encrypter.h"
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <string.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/quic_flags.h"
+#include "net/quic/quic_utils.h"
 
 using base::StringPiece;
 
 namespace net {
 
 namespace {
 
 // The maximum size in bytes of the nonce, including 8 bytes of sequence number.
 // ChaCha20 uses only the 8 byte sequence number and AES-GCM uses 12 bytes.
 const size_t kMaxNonceSize = 12;
@@ skipping 90 matching lines @@
   size_t ciphertext_size = GetCiphertextSize(plaintext.length());
   if (max_output_length < ciphertext_size) {
     return false;
   }
   // TODO(ianswett): Introduce a check to ensure that we don't encrypt with the
   // same packet number twice.
   const size_t nonce_size = nonce_prefix_size_ + sizeof(packet_number);
   ALIGNAS(4) char nonce_buffer[kMaxNonceSize];
   memcpy(nonce_buffer, nonce_prefix_, nonce_prefix_size_);
   if (FLAGS_quic_include_path_id_in_iv) {
-    // Setting the nonce below relies on QuicPathId and QuicPacketNumber being
-    // specific sizes.
-    static_assert(sizeof(path_id) == 1, "Size of QuicPathId changed.");
-    static_assert(sizeof(packet_number) == 8,
-                  "Size of QuicPacketNumber changed.");
-    // Use path_id and lower 7 bytes of packet_number as lower 8 bytes of nonce.
     uint64_t path_id_packet_number =
-        (static_cast<uint64_t>(path_id) << 56) | packet_number;
-    DCHECK(path_id != kDefaultPathId || path_id_packet_number == packet_number);
+        QuicUtils::PackPathIdAndPacketNumber(path_id, packet_number);
     memcpy(nonce_buffer + nonce_prefix_size_, &path_id_packet_number,
            sizeof(path_id_packet_number));
   } else {
     memcpy(nonce_buffer + nonce_prefix_size_, &packet_number,
            sizeof(packet_number));
   }
 
   if (!Encrypt(StringPiece(nonce_buffer, nonce_size), associated_data,
                plaintext, reinterpret_cast<unsigned char*>(output))) {
     return false;
@@ skipping 24 matching lines @@
 
 StringPiece AeadBaseEncrypter::GetNoncePrefix() const {
   if (nonce_prefix_size_ == 0) {
     return StringPiece();
   }
   return StringPiece(reinterpret_cast<const char*>(nonce_prefix_),
                      nonce_prefix_size_);
 }
 
 }  // namespace net