relnote: Deprecate quic_inplace_encryption.

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/logging.h"
 #include "base/macros.h"
@@ skipping 553 matching lines @@
   DCHECK_GE(max_plaintext_size_, packet_size_);
   // ACK Frames will be truncated due to length only if they're the only frame
   // in the packet, and if packet_size_ was set to max_plaintext_size_. If
   // truncation due to length occurred, then GetSerializedFrameLength will have
   // returned all bytes free.
   bool possibly_truncated_by_length = packet_size_ == max_plaintext_size_ &&
                                       queued_frames_.size() == 1 &&
                                       queued_frames_.back().type == ACK_FRAME;
   // Use the packet_size_ instead of the buffer size to ensure smaller
   // packet sizes are properly used.
-  size_t encrypted_length = 0u;
-  if (FLAGS_quic_inplace_encryption) {
-    size_t length = framer_->BuildDataPacket(header, queued_frames_,
-                                             encrypted_buffer, packet_size_);
-    if (length == 0) {
-      QUIC_BUG << "Failed to serialize " << queued_frames_.size() << " frames.";
-      return NoPacket();
-    }
+  size_t length = framer_->BuildDataPacket(header, queued_frames_,
+                                           encrypted_buffer, packet_size_);
+  if (length == 0) {
+    QUIC_BUG << "Failed to serialize " << queued_frames_.size() << " frames.";
+    return NoPacket();
+  }
 
-    // TODO(ianswett) Consider replacing QuicPacket with something else, since
-    // it's only used to provide convenience methods to FEC and encryption.
-    QuicPacket packet(encrypted_buffer, length,
-                      /* owns_buffer */ false,
-                      header.public_header.connection_id_length,
-                      header.public_header.version_flag,
-                      header.public_header.packet_number_length);
-    OnBuiltFecProtectedPayload(header, packet.FecProtectedData());
+  // TODO(ianswett) Consider replacing QuicPacket with something else, since
+  // it's only used to provide convenience methods to FEC and encryption.
+  QuicPacket packet(encrypted_buffer, length,
+                    /* owns_buffer */ false,
+                    header.public_header.connection_id_length,
+                    header.public_header.version_flag,
+                    header.public_header.packet_number_length);
+  OnBuiltFecProtectedPayload(header, packet.FecProtectedData());
 
-    // Because of possible truncation, we can't be confident that our
-    // packet size calculation worked correctly.
-    if (!possibly_truncated_by_length) {
-      DCHECK_EQ(packet_size_, length);
-    }
-    // Immediately encrypt the packet, to ensure we don't encrypt the same
-    // packet number multiple times.
-    encrypted_length =
-        framer_->EncryptPayload(encryption_level_, packet_number_, packet,
-                                encrypted_buffer, encrypted_buffer_len);
-  } else {
-    // The optimized encryption algorithm implementations run faster when
-    // operating on aligned memory.
-    // TODO(rtenneti): Change the default 64 alignas value (used the default
-    // value from CACHELINE_SIZE).
-    ALIGNAS(64) char buffer[kMaxPacketSize];
-    size_t length =
-        framer_->BuildDataPacket(header, queued_frames_, buffer, packet_size_);
-    if (length == 0) {
-      QUIC_BUG << "Failed to serialize " << queued_frames_.size() << " frames.";
-      return NoPacket();
-    }
-
-    // TODO(ianswett) Consider replacing QuicPacket with something else, since
-    // it's only used to provide convenience methods to FEC and encryption.
-    QuicPacket packet(buffer, length,
-                      /* owns_buffer */ false,
-                      header.public_header.connection_id_length,
-                      header.public_header.version_flag,
-                      header.public_header.packet_number_length);
-    OnBuiltFecProtectedPayload(header, packet.FecProtectedData());
-
-    // Because of possible truncation, we can't be confident that our
-    // packet size calculation worked correctly.
-    if (!possibly_truncated_by_length) {
-      DCHECK_EQ(packet_size_, length);
-    }
-    // Immediately encrypt the packet, to ensure we don't encrypt the same
-    // packet number multiple times.
-    encrypted_length =
-        framer_->EncryptPayload(encryption_level_, packet_number_, packet,
-                                encrypted_buffer, encrypted_buffer_len);
+  // Because of possible truncation, we can't be confident that our
+  // packet size calculation worked correctly.
+  if (!possibly_truncated_by_length) {
+    DCHECK_EQ(packet_size_, length);
   }
+  // Immediately encrypt the packet, to ensure we don't encrypt the same
+  // packet number multiple times.
+  size_t encrypted_length =
+      framer_->EncryptPayload(encryption_level_, packet_number_, packet,
+                              encrypted_buffer, encrypted_buffer_len);
   if (encrypted_length == 0) {
     QUIC_BUG << "Failed to encrypt packet number " << packet_number_;
     return NoPacket();
   }
 
   // Update |needs_padding_| flag of |queued_retransmittable_frames_| here, and
   // not in AddFrame, because when the first padded frame is added to the queue,
   // it might not be retransmittable, and hence the flag would end up being not
   // set.
   if (queued_retransmittable_frames_.get() != nullptr) {
@@ skipping 235 matching lines @@
   hash_map<QuicPathId, QuicPacketNumber>::iterator it =
       multipath_packet_number_.find(path_id);
   // If path_id is not in the map, it's a new path. Set packet_number to 0.
   packet_number_ = it == multipath_packet_number_.end() ? 0 : it->second;
   current_path_ = path_id;
   // Switching path needs to update packet number length.
   UpdatePacketNumberLength(least_packet_awaited_by_peer, max_packets_in_flight);
 }
 
 }  // namespace net