Merge branch 'main' of github.com:aws/aws-lc into sha3_absorb_squeeze

Author: manastasova

crypto/CMakeLists.txt

@@ -330,7 +330,6 @@ if(ENABLE_DILITHIUM)
     DILITHIUM_SOURCES
 
     evp_extra/p_pqdsa_asn1.c
-    dilithium/ml_dsa.c
   )
 endif()
 
@@ -778,13 +777,13 @@ if(BUILD_TESTING)
     ecdh_extra/ecdh_test.cc
     dh_extra/dh_test.cc
     digest_extra/digest_test.cc
-    dilithium/p_pqdsa_test.cc
     dsa/dsa_test.cc
     des/des_test.cc
     endian_test.cc
     err/err_test.cc
     evp_extra/evp_extra_test.cc
     evp_extra/evp_test.cc
+    evp_extra/p_pqdsa_test.cc
     evp_extra/scrypt_test.cc
     fipsmodule/aes/aes_test.cc
     fipsmodule/bn/bn_test.cc

crypto/evp_extra/internal.h

@@ -7,7 +7,7 @@
 #include <openssl/base.h>
 #include "../fipsmodule/evp/internal.h"
 
-#include "../dilithium/ml_dsa.h"
+#include "../fipsmodule/ml_dsa/ml_dsa.h"
 
 #define PKCS8_VERSION_ONE 0
 #define PKCS8_VERSION_TWO 1

crypto/evp_extra/p_pqdsa_asn1.c

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

crypto/dilithium/p_pqdsa_test.cc crypto/evp_extra/p_pqdsa_test.cc

@@ -16,9 +16,9 @@
 
 #ifdef ENABLE_DILITHIUM
 
+#include "../fipsmodule/ml_dsa/ml_dsa.h"
 #include "../test/file_test.h"
 #include "../test/test_util.h"
-#include "ml_dsa.h"
 
 // mldsa44kPublicKey is an example ML-DSA-44 public key
 static const uint8_t mldsa44kPublicKey[] = {
@@ -1001,7 +1001,7 @@ static const struct PQDSATestVector parameterSet[] = {
     1312,
     2560,
     2420,
-    "dilithium/kat/MLDSA_44_hedged_pure.txt",
+    "ml_dsa/kat/MLDSA_44_hedged_pure.txt",
     mldsa44kPublicKey,
     mldsa44kPublicKeySPKI,
     1334,
@@ -1015,7 +1015,7 @@ static const struct PQDSATestVector parameterSet[] = {
     1952,
     4032,
     3309,
-    "dilithium/kat/MLDSA_65_hedged_pure.txt",
+    "ml_dsa/kat/MLDSA_65_hedged_pure.txt",
     mldsa65kPublicKey,
     mldsa65kPublicKeySPKI,
     1974,
@@ -1029,7 +1029,7 @@ static const struct PQDSATestVector parameterSet[] = {
     2592,
     4896,
     4627,
-    "dilithium/kat/MLDSA_87_hedged_pure.txt",
+    "ml_dsa/kat/MLDSA_87_hedged_pure.txt",
     mldsa87kPublicKey,
     mldsa87kPublicKeySPKI,
     2614,
@@ -1046,7 +1046,7 @@ INSTANTIATE_TEST_SUITE_P(All, PQDSAParameterTest, testing::ValuesIn(parameterSet
                              -> std::string { return params.param.name; });
 
 TEST_P(PQDSAParameterTest, KAT) {
-  std::string kat_filepath = "crypto/";
+  std::string kat_filepath = "crypto/fipsmodule/";
   kat_filepath += GetParam().kat_filename;
 
   FileTestGTest(kat_filepath.c_str(), [&](FileTest *t) {

crypto/evp_extra/print.c

@@ -66,7 +66,7 @@
 #include "../fipsmodule/rsa/internal.h"
 
 #ifdef ENABLE_DILITHIUM
-#include "../dilithium/ml_dsa.h"
+#include "../fipsmodule/ml_dsa/ml_dsa.h"
 #include "../fipsmodule/pqdsa/internal.h"
 #endif
 

crypto/fipsmodule/bcm.c

@@ -130,6 +130,9 @@
 #include "kem/kem.c"
 #include "md4/md4.c"
 #include "md5/md5.c"
+#ifdef ENABLE_DILITHIUM
+#include "ml_dsa/ml_dsa.c"
+#endif
 #include "ml_kem/ml_kem.c"
 #include "modes/cbc.c"
 #include "modes/cfb.c"

crypto/fipsmodule/evp/p_pqdsa.c

@@ -5,10 +5,10 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 
-#include "../delocate.h"
-#include "../crypto/dilithium/ml_dsa.h"
 #include "../crypto/evp_extra/internal.h"
+#include "../crypto/fipsmodule/ml_dsa/ml_dsa.h"
 #include "../crypto/internal.h"
+#include "../delocate.h"
 #include "../pqdsa/internal.h"
 
 // PQDSA PKEY functions

crypto/dilithium/kat/MLDSA_44_hedged_pure.txt crypto/fipsmodule/ml_dsa/kat/MLDSA_44_hedged_pure.txt

@@ -1,22 +1,22 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
 
-#include "../evp_extra/internal.h"
-#include "../fipsmodule/evp/internal.h"
+#include "../../evp_extra/internal.h"
+#include "../evp/internal.h"
 #include "ml_dsa.h"
-#include "pqcrystals_dilithium_ref_common/sign.h"
-#include "pqcrystals_dilithium_ref_common/params.h"
+#include "ml_dsa_ref/params.h"
+#include "ml_dsa_ref/sign.h"
 
 // These includes are required to compile ML-DSA. These can be moved to bcm.c
 // when ML-DSA is added to the fipsmodule directory.
-#include "./pqcrystals_dilithium_ref_common/ntt.c"
-#include "./pqcrystals_dilithium_ref_common/packing.c"
-#include "./pqcrystals_dilithium_ref_common/params.c"
-#include "./pqcrystals_dilithium_ref_common/poly.c"
-#include "./pqcrystals_dilithium_ref_common/polyvec.c"
-#include "./pqcrystals_dilithium_ref_common/reduce.c"
-#include "./pqcrystals_dilithium_ref_common/rounding.c"
-#include "./pqcrystals_dilithium_ref_common/sign.c"
+#include "./ml_dsa_ref/ntt.c"
+#include "./ml_dsa_ref/packing.c"
+#include "./ml_dsa_ref/params.c"
+#include "./ml_dsa_ref/poly.c"
+#include "./ml_dsa_ref/polyvec.c"
+#include "./ml_dsa_ref/reduce.c"
+#include "./ml_dsa_ref/rounding.c"
+#include "./ml_dsa_ref/sign.c"
 
 // Note: These methods currently default to using the reference code for
 // ML-DSA. In a future where AWS-LC has optimized options available,

crypto/dilithium/kat/MLDSA_65_hedged_pure.txt crypto/fipsmodule/ml_dsa/kat/MLDSA_65_hedged_pure.txt

@@ -4,7 +4,7 @@
 #include "ntt.h"
 #include "reduce.h"
 #include "rounding.h"
-#include "../../fipsmodule/sha/internal.h"
+#include "../../sha/internal.h"
 
 /*************************************************
 * Name:        ml_dsa_poly_reduce