Modify function selectECHConfig to take in a const vector of ech configs

Summary: Modify function `selectECHConfig` to take in a const vector of ech configs. Reviewed By: reanimus Differential Revision: D24865309 fbshipit-source-id: be079d3e8b50d8dd037000d103ff641770c9ab0d
facebookincubator · Nov 14, 2020 · 47ee698 · 47ee698
1 parent 3f07673
commit 47ee698
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/fizz/protocol/ech/Encryption.cpp b/fizz/protocol/ech/Encryption.cpp
@@ -18,12 +18,12 @@ namespace fizz {
 namespace ech {
 
 folly::Optional<SupportedECHConfig> selectECHConfig(
-    std::vector<ECHConfig> configs,
+    const std::vector<ECHConfig>& configs,
     std::vector<hpke::KEMId> supportedKEMs,
     std::vector<hpke::AeadId> supportedAeads) {
   // Received set of configs is in order of server preference so
   // we should be selecting the first one that we can support.
-  for (auto& config : configs) {
+  for (const auto& config : configs) {
     folly::io::Cursor cursor(config.ech_config_content.get());
     if (config.version == ECHVersion::V7) {
       auto echConfig = decode<ECHConfigContentDraft7>(cursor);
@@ -45,7 +45,7 @@ folly::Optional<SupportedECHConfig> selectECHConfig(
           auto associatedCipherKdf =
               hpke::getKDFId(getHashFunction(getCipherSuite(suite.aeadId)));
           if (suite.kdfId == associatedCipherKdf) {
-            return SupportedECHConfig{std::move(config), suite};
+            return SupportedECHConfig{config.clone(), suite};
           }
         }
       }

diff --git a/fizz/protocol/ech/Encryption.h b/fizz/protocol/ech/Encryption.h
@@ -23,7 +23,7 @@ struct SupportedECHConfig {
 };
 
 folly::Optional<SupportedECHConfig> selectECHConfig(
-    std::vector<ECHConfig> configs,
+    const std::vector<ECHConfig>& configs,
     std::vector<hpke::KEMId> supportedKEMs,
     std::vector<hpke::AeadId> supportedAeads);
 

diff --git a/fizz/protocol/ech/Types.h b/fizz/protocol/ech/Types.h
@@ -41,11 +41,17 @@ struct ECHConfigContentDraft7 {
     std::vector<Extension> extensions;
 };
 
-
 struct ECHConfig {
-    ECHVersion version;
-    uint16_t length;
-    Buf ech_config_content;
+  ECHVersion version;
+  uint16_t length;
+  Buf ech_config_content;
+  ECHConfig clone() const {
+    ECHConfig copy;
+    copy.version = this->version;
+    copy.length = this->length;
+    copy.ech_config_content = this->ech_config_content->clone();
+    return copy;
+  }
 };
 
 } // namespace ech

diff --git a/fizz/protocol/ech/test/EncryptionTest.cpp b/fizz/protocol/ech/test/EncryptionTest.cpp
@@ -127,7 +127,7 @@ TEST(EncryptionTest, TestValidECHConfigContent) {
       hpke::AeadId::TLS_AES_128_GCM_SHA256};
 
   folly::Optional<SupportedECHConfig> result =
-      selectECHConfig(std::move(configs), supportedKEMs, supportedAeads);
+      selectECHConfig(configs, supportedKEMs, supportedAeads);
   EXPECT_TRUE(result.hasValue());
 
   ECHConfig gotConfig = std::move(result.value().config);
@@ -157,7 +157,7 @@ TEST(EncryptionTest, TestInvalidECHConfigContent) {
       hpke::AeadId::TLS_AES_128_GCM_SHA256};
 
   folly::Optional<SupportedECHConfig> result =
-      selectECHConfig(std::move(configs), supportedKEMs, supportedAeads);
+      selectECHConfig(configs, supportedKEMs, supportedAeads);
 
   EXPECT_FALSE(result.hasValue());
 }