Retransmit non-crypto packets with forward secure encryption if the connection has gone forward sec…

net/quic/quic_packet_creator.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/quic_packet_creator.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 398 matching lines @@
   const QuicPacketNumberLength saved_next_length = next_packet_number_length_;
   const bool saved_should_fec_protect = fec_protect_;
   const bool needs_padding = needs_padding_;
   const EncryptionLevel default_encryption_level = encryption_level_;
 
   // Temporarily set the packet number length, stop FEC protection,
   // and change the encryption level.
   packet_number_length_ = original_length;
   next_packet_number_length_ = original_length;
   fec_protect_ = false;
-  encryption_level_ = original_encryption_level;
   needs_padding_ = frames.needs_padding();
+  // Only preserve the original encryption level if it's a handshake packet or
+  // if we haven't gone forward secure.
+  if (frames.HasCryptoHandshake() ||
+      encryption_level_ != ENCRYPTION_FORWARD_SECURE) {
+    encryption_level_ = original_encryption_level;
+  }
 
   // Serialize the packet and restore the FEC and packet number length state.
   SerializedPacket serialized_packet =
       SerializeAllFrames(frames.frames(), buffer, buffer_len);
   packet_number_length_ = saved_length;
   next_packet_number_length_ = saved_next_length;
   fec_protect_ = saved_should_fec_protect;
   needs_padding_ = needs_padding;
   encryption_level_ = default_encryption_level;
 
@@ skipping 356 matching lines @@
     QuicPacketCount max_packets_in_flight) {
   set_max_packets_per_fec_group(static_cast<size_t>(
       kMaxPacketsInFlightMultiplierForFecGroupSize * max_packets_in_flight));
 }
 
 void QuicPacketCreator::OnRttChange(QuicTime::Delta rtt) {
   fec_timeout_ = rtt.Multiply(rtt_multiplier_for_fec_timeout_);
 }
 
 }  // namespace net