Add x22519_kyber512_experimental

Summary: Preemptively add "duplicate" named group `x22519_kyber512_experimental` in case it is needed Reviewed By: sotodel, knekritz Differential Revision: D56429886 fbshipit-source-id: 06cba2595b59b1a4a8e9fdd643b933dae4fccbaf
facebookincubator · Apr 23, 2024 · 5ccb9ce · 5ccb9ce
1 parent 32ddfef
commit 5ccb9ce
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/fizz/protocol/OpenSSLFactory.cpp b/fizz/protocol/OpenSSLFactory.cpp
@@ -30,6 +30,7 @@ std::unique_ptr<KeyExchange> OpenSSLFactory::makeKeyExchange(
       return std::make_unique<X25519KeyExchange>();
 #if FIZZ_HAVE_OQS
     case NamedGroup::x25519_kyber512:
+    case NamedGroup::x25519_kyber512_experimental:
       return std::make_unique<HybridKeyExchange>(
           std::make_unique<X25519KeyExchange>(),
           OQSKeyExchange::createOQSKeyExchange(mode, OQS_KEM_alg_kyber_512));

diff --git a/fizz/protocol/test/OpenSSLFactoryTest.cpp b/fizz/protocol/test/OpenSSLFactoryTest.cpp
@@ -46,6 +46,7 @@ INSTANTIATE_TEST_SUITE_P(
         NamedGroup::kyber512,
         NamedGroup::x25519_kyber768_draft00,
         NamedGroup::x25519_kyber768_experimental,
+        NamedGroup::x25519_kyber512_experimental,
         NamedGroup::secp256r1_kyber768_draft00,
         NamedGroup::secp384r1_kyber768
 #endif

diff --git a/fizz/record/Types.cpp b/fizz/record/Types.cpp
@@ -261,6 +261,8 @@ std::string toString(NamedGroup group) {
       return "x25519_kyber768_draft00";
     case NamedGroup::x25519_kyber768_experimental:
       return "x25519_kyber768_experimental";
+    case NamedGroup::x25519_kyber512_experimental:
+      return "x25519_kyber512_experimental";
     case NamedGroup::secp256r1_kyber768_draft00:
       return "secp256r1_kyber768_draft00";
     case NamedGroup::secp384r1_kyber768:

diff --git a/fizz/record/Types.h b/fizz/record/Types.h
@@ -355,10 +355,11 @@ enum class NamedGroup : uint16_t {
 
   // experimental
   /**
-   * Internal equivalent of x25519_kyber768 to get clean data for external
-   * traffic experiments
+   * Internal equivalent of x25519_kyber768 and x25519_kyber512 to get clean
+   * data for external traffic experiments
    */
   x25519_kyber768_experimental = 65024,
+  x25519_kyber512_experimental = 65025,
 
   /**
    * Hybrid of secp521r1 and x25519. TLS Supported Group 510 is reserved for

diff --git a/fizz/util/Parse-inl.h b/fizz/util/Parse-inl.h
@@ -63,6 +63,8 @@ inline NamedGroup parse(folly::StringPiece s) {
       {"x25519_kyber768_draft00", NamedGroup::x25519_kyber768_draft00},
       {"x25519_kyber768_experimental",
        NamedGroup::x25519_kyber768_experimental},
+      {"x25519_kyber512_experimental",
+       NamedGroup::x25519_kyber512_experimental},
       {"secp256r1_kyber768_draft00", NamedGroup::secp256r1_kyber768_draft00},
       {"secp384r1_kyber768", NamedGroup::secp384r1_kyber768}};