moved pqdsa to fipsmodule

aws · Dec 4, 2024 · f9eff24 · f9eff24
1 parent 066c700
commit f9eff24
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 19 deletions.
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
@@ -323,9 +323,9 @@ if(ENABLE_DILITHIUM)
   set(
     DILITHIUM_SOURCES
 
-    dilithium/pqdsa.c
-    dilithium/p_pqdsa.c
-    dilithium/p_pqdsa_asn1.c
+    fipsmodule/pqdsa/pqdsa.c
+    fipsmodule/evp/p_pqdsa.c
+    evp_extra/p_pqdsa_asn1.c
     dilithium/ml_dsa.c
   )
 endif()

diff --git a/crypto/dilithium/p_pqdsa_test.cc b/crypto/dilithium/p_pqdsa_test.cc
@@ -12,7 +12,7 @@
 #include <vector>
 #include "../fipsmodule/evp/internal.h"
 #include "../internal.h"
-#include "internal.h"
+#include "../fipsmodule/pqdsa/internal.h"
 
 #ifdef ENABLE_DILITHIUM
 

diff --git a/crypto/evp_extra/evp_asn1.c b/crypto/evp_extra/evp_asn1.c
@@ -68,7 +68,7 @@
 #include "../bytestring/internal.h"
 #include "../internal.h"
 #include "internal.h"
-#include "../dilithium/internal.h"
+#include "../fipsmodule/pqdsa/internal.h"
 
 // parse_key_type takes the algorithm cbs sequence |cbs| and extracts the OID.
 // The OID is then searched against ASN.1 methods for a method with that OID.

diff --git a/crypto/dilithium/p_pqdsa_asn1.c → crypto/evp_extra/p_pqdsa_asn1.c b/crypto/dilithium/p_pqdsa_asn1.c → crypto/evp_extra/p_pqdsa_asn1.c
@@ -7,11 +7,11 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 
-#include "../evp_extra/internal.h"
-#include "../fipsmodule/evp/internal.h"
-#include "../internal.h"
-#include "ml_dsa.h"
 #include "internal.h"
+#include "../fipsmodule/evp/internal.h"
+#include "../crypto/fipsmodule/pqdsa/internal.h"
+#include "../crypto/internal.h"
+#include "../dilithium/ml_dsa.h"
 
 static void pqdsa_free(EVP_PKEY *pkey) {
   PQDSA_KEY_free(pkey->pkey.pqdsa_key);

diff --git a/crypto/evp_extra/print.c b/crypto/evp_extra/print.c
@@ -67,7 +67,7 @@
 
 #ifdef ENABLE_DILITHIUM
 #include "../dilithium/ml_dsa.h"
-#include "../dilithium/internal.h"
+#include "../fipsmodule/pqdsa/internal.h"
 #endif
 
 

diff --git a/crypto/dilithium/p_pqdsa.c → crypto/fipsmodule/evp/p_pqdsa.c b/crypto/dilithium/p_pqdsa.c → crypto/fipsmodule/evp/p_pqdsa.c
@@ -5,11 +5,10 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 
+#include "../crypto/dilithium/ml_dsa.h"
+#include "../crypto/evp_extra/internal.h"
 #include "../crypto/internal.h"
-#include "../fipsmodule/evp/internal.h"
-#include "../evp_extra/internal.h"
-#include "ml_dsa.h"
-#include "internal.h"
+#include "../pqdsa/internal.h"
 
 // PQDSA PKEY functions
 

diff --git a/crypto/dilithium/internal.h → crypto/fipsmodule/pqdsa/internal.h b/crypto/dilithium/internal.h → crypto/fipsmodule/pqdsa/internal.h
diff --git a/crypto/dilithium/pqdsa.c → crypto/fipsmodule/pqdsa/pqdsa.c b/crypto/dilithium/pqdsa.c → crypto/fipsmodule/pqdsa/pqdsa.c
@@ -4,10 +4,10 @@
 #include <openssl/mem.h>
 
 #include <openssl/base.h>
-#include "../evp_extra/internal.h"
-#include "../fipsmodule/delocate.h"
+#include "../../evp_extra/internal.h"
+#include "../delocate.h"
 #include "internal.h"
-#include "ml_dsa.h"
+#include "../crypto/dilithium/ml_dsa.h"
 
 // ML-DSA OIDs as defined within:
 // https://csrc.nist.gov/projects/computer-security-objects-register/algorithm-registration

diff --git a/crypto/x509/algorithm.c b/crypto/x509/algorithm.c
@@ -62,7 +62,7 @@
 #include <openssl/evp.h>
 #include <openssl/obj.h>
 
-#include "../dilithium/internal.h"
+#include "../fipsmodule/pqdsa/internal.h"
 #include "../fipsmodule/evp/internal.h"
 #include "internal.h"
 

diff --git a/crypto/x509/x509_test.cc b/crypto/x509/x509_test.cc
@@ -39,7 +39,7 @@
 #include "../evp_extra/internal.h"
 #include "../internal.h"
 #include "../test/test_util.h"
-#include "../dilithium/internal.h"
+#include "../fipsmodule/pqdsa/internal.h"
 
 #if defined(OPENSSL_THREADS)
 #include <thread>