commit 6987b4ab40325b3fab82417cf2ad2125a4819030
author QUICHE team <quiche-dev@google.com> Fri Mar 15 16:23:04 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Sat Mar 16 12:50:20 2019 -0700
tree 8ee2b9a754a6c898b7befeb2719cb43ba91b3299
parent 39a71e5af82f56415d17e6dd22616e26c5b7fe60

Rename ENCRYPTION_NONE to ENCRYPTION_INITIAL

gfe-relnote: n/a (renaming enum value)
PiperOrigin-RevId: 238730788
Change-Id: I628f4a333a257ebffcb018084dc09668ebfcacf1

quic/core/quic_framer.cc

diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc
index 1af1f68..2d1e665 100644
--- a/quic/core/quic_framer.cc
+++ b/quic/core/quic_framer.cc
@@ -461,8 +461,8 @@
       last_version_label_(0),
       version_(PROTOCOL_UNSUPPORTED, QUIC_VERSION_UNSUPPORTED),
       supported_versions_(supported_versions),
-      decrypter_level_(ENCRYPTION_NONE),
-      alternative_decrypter_level_(ENCRYPTION_NONE),
+      decrypter_level_(ENCRYPTION_INITIAL),
+      alternative_decrypter_level_(ENCRYPTION_INITIAL),
       alternative_decrypter_latch_(false),
       perspective_(perspective),
       validate_flags_(true),
@@ -478,7 +478,7 @@
   DCHECK(!supported_versions.empty());
   version_ = supported_versions_[0];
   decrypter_ = QuicMakeUnique<NullDecrypter>(perspective);
-  encrypter_[ENCRYPTION_NONE] = QuicMakeUnique<NullEncrypter>(perspective);
+  encrypter_[ENCRYPTION_INITIAL] = QuicMakeUnique<NullEncrypter>(perspective);
 }
 
 QuicFramer::~QuicFramer() {}
@@ -3951,7 +3951,7 @@
   // level to hand. Both the NullEncrypter and AES-GCM have a tag length of 12.
   size_t min_plaintext_size = ciphertext_size;
 
-  for (int i = ENCRYPTION_NONE; i < NUM_ENCRYPTION_LEVELS; i++) {
+  for (int i = ENCRYPTION_INITIAL; i < NUM_ENCRYPTION_LEVELS; i++) {
     if (encrypter_[i] != nullptr) {
       size_t size = encrypter_[i]->GetMaxPlaintextSize(ciphertext_size);
       if (size < min_plaintext_size) {
@@ -4005,7 +4005,7 @@
         // switch back.
         decrypter_ = std::move(alternative_decrypter_);
         decrypter_level_ = alternative_decrypter_level_;
-        alternative_decrypter_level_ = ENCRYPTION_NONE;
+        alternative_decrypter_level_ = ENCRYPTION_INITIAL;
       } else {
         // Switch the alternative decrypter so that we use it first next time.
         decrypter_.swap(alternative_decrypter_);