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

net/quic/crypto/aead_base_decrypter_nss.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_decrypter.h"
 
 #include <pk11pub.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "crypto/scoped_nss_types.h"
 #include "net/quic/quic_flags.h"
+#include "net/quic/quic_utils.h"
 
 using base::StringPiece;
 
 namespace net {
 
 AeadBaseDecrypter::AeadBaseDecrypter(CK_MECHANISM_TYPE aead_mechanism,
                                      size_t key_size,
                                      size_t auth_tag_size,
                                      size_t nonce_prefix_size)
     : aead_mechanism_(aead_mechanism),
@@ skipping 33 matching lines @@
                                       size_t max_output_length) {
   if (ciphertext.length() < auth_tag_size_) {
     return false;
   }
 
   uint8_t nonce[sizeof(nonce_prefix_) + sizeof(packet_number)];
   const size_t nonce_size = nonce_prefix_size_ + sizeof(packet_number);
   DCHECK_LE(nonce_size, sizeof(nonce));
   memcpy(nonce, 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 + nonce_prefix_size_, &path_id_packet_number,
            sizeof(path_id_packet_number));
   } else {
     memcpy(nonce + nonce_prefix_size_, &packet_number, sizeof(packet_number));
   }
 
   // NSS 3.14.x incorrectly requires an output buffer at least as long as
   // the ciphertext (NSS bug
   // https://bugzilla.mozilla.org/show_bug.cgi?id= 853674). Fortunately
   // QuicDecrypter::Decrypt() specifies that |output| must be as long as
@@ skipping 52 matching lines @@
 
 StringPiece AeadBaseDecrypter::GetNoncePrefix() const {
   if (nonce_prefix_size_ == 0) {
     return StringPiece();
   }
   return StringPiece(reinterpret_cast<const char*>(nonce_prefix_),
                      nonce_prefix_size_);
 }
 
 }  // namespace net