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

net/quic/crypto/aead_base_encrypter_nss.cc

Index: net/quic/crypto/aead_base_encrypter_nss.cc
diff --git a/net/quic/crypto/aead_base_encrypter_nss.cc b/net/quic/crypto/aead_base_encrypter_nss.cc
index 80731ed5b8ac07e3a9e1bb8fab962730857f44e9..c7841e1dacc8e0e89be0a78d993418983c8f502c 100644
--- a/net/quic/crypto/aead_base_encrypter_nss.cc
+++ b/net/quic/crypto/aead_base_encrypter_nss.cc
@@ -9,6 +9,7 @@
 #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;
 
@@ -135,15 +136,8 @@ bool AeadBaseEncrypter::EncryptPacket(QuicPathId path_id,
   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 {