Retire out-of-module KEM folder

aws · Sep 6, 2024 · 810df01 · 810df01
1 parent 16ca6e7
commit 810df01
Show file tree

Hide file tree

Showing 11 changed files with 167 additions and 367 deletions.
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
@@ -438,8 +438,6 @@ add_library(
   ex_data.c
   hpke/hpke.c
   hrss/hrss.c
-  kem/kem.c
-  kem/kem_methods.c
   kyber/kyber512r3_ref.c
   kyber/kyber768r3_ref.c
   kyber/kyber1024r3_ref.c

diff --git a/crypto/evp_extra/evp_extra_test.cc b/crypto/evp_extra/evp_extra_test.cc
@@ -34,8 +34,8 @@
 #include "../test/test_util.h"
 #include "../internal.h"
 
-#include "../kem/internal.h"
 #include "../fipsmodule/evp/internal.h"
+#include "../fipsmodule/kem/internal.h"
 
 
 // kExampleRSAKeyDER is an RSA private key in ASN.1, DER format. Of course, you

diff --git a/crypto/kem/README.md → crypto/fipsmodule/kem/README.md b/crypto/kem/README.md → crypto/fipsmodule/kem/README.md
diff --git a/crypto/fipsmodule/kem/kem.c b/crypto/fipsmodule/kem/kem.c
@@ -3,7 +3,7 @@
 
 #include <openssl/base.h>
 
-#include "../../kem/internal.h"
+#include "../../kyber/kem_kyber.h"
 #include "../delocate.h"
 #include "../ml_kem/ml_kem.h"
 #include "internal.h"
@@ -169,27 +169,23 @@ DEFINE_LOCAL_DATA(KEM, KEM_ml_kem_1024) {
 }
 
 const KEM *KEM_find_kem_by_nid(int nid) {
-
   switch (nid) {
     case NID_MLKEM512:
       return KEM_ml_kem_512();
     case NID_MLKEM768:
       return KEM_ml_kem_768();
     case NID_MLKEM1024:
       return KEM_ml_kem_1024();
+    // Try legacy KEMs.
+    case NID_KYBER512_R3:
+      return get_legacy_kem_kyber512_r3();
+    case NID_KYBER768_R3:
+      return get_legacy_kem_kyber768_r3();
+    case NID_KYBER1024_R3:
+      return get_legacy_kem_kyber1024_r3();
     default:
-      break;
-  }
-
-  // We couldn't match a known KEM. Try legacy KEMs.
-  const KEM *legacy_kems = get_legacy_kems();
-  for (size_t i = 0; i < AWSLC_NUM_LEGACY_KEMS; i++) {
-    if (legacy_kems[i].nid == nid) {
-      return &legacy_kems[i];
-    }
+      return NULL;
   }
-
-  return NULL;
 }
 
 KEM_KEY *KEM_KEY_new(void) {

diff --git a/crypto/kem/internal.h b/crypto/kem/internal.h
diff --git a/crypto/kem/kem.c b/crypto/kem/kem.c
diff --git a/crypto/kem/kem_methods.c b/crypto/kem/kem_methods.c