Remove ENABLE_DILITHIUM flag

crypto/CMakeLists.txt

@@ -324,16 +324,6 @@ else()
   file(COPY ${GENERATE_CODE_ROOT}/err_data.c DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 endif()
 
-set(DILITHIUM_SOURCES)
-if(ENABLE_DILITHIUM)
-  set(
-    DILITHIUM_SOURCES
-
-    evp_extra/p_pqdsa_asn1.c
-    dilithium/ml_dsa.c
-  )
-endif()
-
 set(CRYPTO_ARCH_OBJECTS "")
 if (ARCH STREQUAL "aarch64" AND CMAKE_GENERATOR MATCHES "Visual Studio")
   msbuild_aarch64_asm(TARGET crypto_objects ASM_FILES ${CRYPTO_ARCH_SOURCES} OUTPUT_OBJECTS CRYPTO_ARCH_OBJECTS)
@@ -411,7 +401,7 @@ add_library(
   dh_extra/params.c
   dh_extra/dh_asn1.c
   digest_extra/digest_extra.c
-  ${DILITHIUM_SOURCES}
+  dilithium/ml_dsa.c
   dsa/dsa.c
   dsa/dsa_asn1.c
   ecdh_extra/ecdh_extra.c
@@ -431,6 +421,7 @@ add_library(
   evp_extra/p_ed25519_asn1.c
   evp_extra/p_hmac_asn1.c
   evp_extra/p_kem_asn1.c
+  evp_extra/p_pqdsa_asn1.c
   evp_extra/p_rsa_asn1.c
   evp_extra/p_x25519.c
   evp_extra/p_x25519_asn1.c

crypto/dilithium/ml_dsa.c

@@ -27,15 +27,15 @@ int ml_dsa_44_keypair(uint8_t *public_key   /* OUT */,
                       uint8_t *private_key  /* OUT */) {
   ml_dsa_params params;
   ml_dsa_44_params_init(&params);
-  return (crypto_sign_keypair(&params, public_key, private_key) == 0);
+  return (ml_dsa_keypair(&params, public_key, private_key) == 0);
 }
 
 int ml_dsa_44_keypair_internal(uint8_t *public_key   /* OUT */,
                                uint8_t *private_key  /* OUT */,
                                const uint8_t *seed   /* IN */) {
   ml_dsa_params params;
   ml_dsa_44_params_init(&params);
-  return crypto_sign_keypair_internal(&params, public_key, private_key, seed) == 0;
+  return ml_dsa_keypair_internal(&params, public_key, private_key, seed) == 0;
 }
 
 int ml_dsa_44_sign(const uint8_t *private_key /* IN */,
@@ -47,8 +47,8 @@ int ml_dsa_44_sign(const uint8_t *private_key /* IN */,
                    size_t ctx_string_len      /* IN */) {
   ml_dsa_params params;
   ml_dsa_44_params_init(&params);
-  return crypto_sign_signature(&params, sig, sig_len, message, message_len,
-                               ctx_string, ctx_string_len, private_key) == 0;
+  return ml_dsa_sign(&params, sig, sig_len, message, message_len,
+                     ctx_string, ctx_string_len, private_key) == 0;
 }
 
 int ml_dsa_44_sign_internal(const uint8_t *private_key  /* IN */,
@@ -61,8 +61,8 @@ int ml_dsa_44_sign_internal(const uint8_t *private_key  /* IN */,
                             uint8_t *rnd                /* IN */) {
   ml_dsa_params params;
   ml_dsa_44_params_init(&params);
-  return crypto_sign_signature_internal(&params, sig, sig_len, message, message_len,
-                                        pre, pre_len, rnd, private_key) == 0;
+  return ml_dsa_sign_internal(&params, sig, sig_len, message, message_len,
+                              pre, pre_len, rnd, private_key) == 0;
 }
 
 int ml_dsa_44_verify(const uint8_t *public_key /* IN */,
@@ -74,8 +74,8 @@ int ml_dsa_44_verify(const uint8_t *public_key /* IN */,
                      size_t ctx_string_len     /* IN */) {
   ml_dsa_params params;
   ml_dsa_44_params_init(&params);
-  return crypto_sign_verify(&params, sig, sig_len, message, message_len,
-                            ctx_string, ctx_string_len, public_key) == 0;
+  return ml_dsa_verify(&params, sig, sig_len, message, message_len,
+                       ctx_string, ctx_string_len, public_key) == 0;
 }
 
 int ml_dsa_44_verify_internal(const uint8_t *public_key /* IN */,
@@ -87,23 +87,23 @@ int ml_dsa_44_verify_internal(const uint8_t *public_key /* IN */,
                               size_t pre_len            /* IN */) {
   ml_dsa_params params;
   ml_dsa_44_params_init(&params);
-  return crypto_sign_verify_internal(&params, sig, sig_len, message, message_len,
-                                     pre, pre_len, public_key) == 0;
+  return ml_dsa_verify_internal(&params, sig, sig_len, message, message_len,
+                                pre, pre_len, public_key) == 0;
 }
 
 int ml_dsa_65_keypair(uint8_t *public_key   /* OUT */,
                       uint8_t *private_key  /* OUT */) {
   ml_dsa_params params;
   ml_dsa_65_params_init(&params);
-  return (crypto_sign_keypair(&params, public_key, private_key) == 0);
+  return (ml_dsa_keypair(&params, public_key, private_key) == 0);
 }
 
 int ml_dsa_65_keypair_internal(uint8_t *public_key   /* OUT */,
                                uint8_t *private_key  /* OUT */,
                                const uint8_t *seed   /* IN */) {
   ml_dsa_params params;
   ml_dsa_65_params_init(&params);
-  return crypto_sign_keypair_internal(&params, public_key, private_key, seed) == 0;
+  return ml_dsa_keypair_internal(&params, public_key, private_key, seed) == 0;
 }
 
 int ml_dsa_65_sign(const uint8_t *private_key /* IN */,
@@ -115,8 +115,8 @@ int ml_dsa_65_sign(const uint8_t *private_key /* IN */,
                    size_t ctx_string_len      /* IN */) {
   ml_dsa_params params;
   ml_dsa_65_params_init(&params);
-  return crypto_sign_signature(&params, sig, sig_len, message, message_len,
-                               ctx_string, ctx_string_len, private_key) == 0;
+  return ml_dsa_sign(&params, sig, sig_len, message, message_len,
+                     ctx_string, ctx_string_len, private_key) == 0;
 }
 
 int ml_dsa_65_sign_internal(const uint8_t *private_key  /* IN */,
@@ -129,8 +129,8 @@ int ml_dsa_65_sign_internal(const uint8_t *private_key  /* IN */,
                             uint8_t *rnd                /* IN */) {
   ml_dsa_params params;
   ml_dsa_65_params_init(&params);
-  return crypto_sign_signature_internal(&params, sig, sig_len, message, message_len,
-                                        pre, pre_len, rnd, private_key) == 0;
+  return ml_dsa_sign_internal(&params, sig, sig_len, message, message_len,
+                              pre, pre_len, rnd, private_key) == 0;
 }
 
 int ml_dsa_65_verify(const uint8_t *public_key /* IN */,
@@ -142,8 +142,8 @@ int ml_dsa_65_verify(const uint8_t *public_key /* IN */,
                      size_t ctx_string_len     /* IN */) {
   ml_dsa_params params;
   ml_dsa_65_params_init(&params);
-  return crypto_sign_verify(&params, sig, sig_len, message, message_len,
-                            ctx_string, ctx_string_len, public_key) == 0;
+  return ml_dsa_verify(&params, sig, sig_len, message, message_len,
+                       ctx_string, ctx_string_len, public_key) == 0;
 }
 
 int ml_dsa_65_verify_internal(const uint8_t *public_key /* IN */,
@@ -155,23 +155,23 @@ int ml_dsa_65_verify_internal(const uint8_t *public_key /* IN */,
                               size_t pre_len            /* IN */) {
   ml_dsa_params params;
   ml_dsa_65_params_init(&params);
-  return crypto_sign_verify_internal(&params, sig, sig_len, message, message_len,
-                                     pre, pre_len, public_key) == 0;
+  return ml_dsa_verify_internal(&params, sig, sig_len, message, message_len,
+                                pre, pre_len, public_key) == 0;
 }
 
 int ml_dsa_87_keypair(uint8_t *public_key   /* OUT */,
                       uint8_t *private_key  /* OUT */) {
   ml_dsa_params params;
   ml_dsa_87_params_init(&params);
-  return (crypto_sign_keypair(&params, public_key, private_key) == 0);
+  return (ml_dsa_keypair(&params, public_key, private_key) == 0);
 }
 
 int ml_dsa_87_keypair_internal(uint8_t *public_key   /* OUT */,
                                uint8_t *private_key  /* OUT */,
                                const uint8_t *seed   /* IN */) {
   ml_dsa_params params;
   ml_dsa_87_params_init(&params);
-  return crypto_sign_keypair_internal(&params, public_key, private_key, seed) == 0;
+  return ml_dsa_keypair_internal(&params, public_key, private_key, seed) == 0;
 }
 
 int ml_dsa_87_sign(const uint8_t *private_key /* IN */,
@@ -183,8 +183,8 @@ int ml_dsa_87_sign(const uint8_t *private_key /* IN */,
                    size_t ctx_string_len      /* IN */) {
   ml_dsa_params params;
   ml_dsa_87_params_init(&params);
-  return crypto_sign_signature(&params, sig, sig_len, message, message_len,
-                               ctx_string, ctx_string_len, private_key) == 0;
+  return ml_dsa_sign(&params, sig, sig_len, message, message_len,
+                     ctx_string, ctx_string_len, private_key) == 0;
 }
 
 int ml_dsa_87_sign_internal(const uint8_t *private_key  /* IN */,
@@ -197,8 +197,8 @@ int ml_dsa_87_sign_internal(const uint8_t *private_key  /* IN */,
                             uint8_t *rnd                /* IN */) {
   ml_dsa_params params;
   ml_dsa_87_params_init(&params);
-  return crypto_sign_signature_internal(&params, sig, sig_len, message, message_len,
-                                        pre, pre_len, rnd, private_key) == 0;
+  return ml_dsa_sign_internal(&params, sig, sig_len, message, message_len,
+                              pre, pre_len, rnd, private_key) == 0;
 }
 
 int ml_dsa_87_verify(const uint8_t *public_key /* IN */,
@@ -210,8 +210,8 @@ int ml_dsa_87_verify(const uint8_t *public_key /* IN */,
                      size_t ctx_string_len     /* IN */) {
   ml_dsa_params params;
   ml_dsa_87_params_init(&params);
-  return crypto_sign_verify(&params, sig, sig_len, message, message_len,
-                            ctx_string, ctx_string_len, public_key) == 0;
+  return ml_dsa_verify(&params, sig, sig_len, message, message_len,
+                       ctx_string, ctx_string_len, public_key) == 0;
 }
 
 int ml_dsa_87_verify_internal(const uint8_t *public_key /* IN */,
@@ -223,7 +223,6 @@ int ml_dsa_87_verify_internal(const uint8_t *public_key /* IN */,
                               size_t pre_len            /* IN */) {
   ml_dsa_params params;
   ml_dsa_87_params_init(&params);
-  return crypto_sign_verify_internal(&params, sig, sig_len, message, message_len,
-                                     pre, pre_len, public_key) == 0;
+  return ml_dsa_verify_internal(&params, sig, sig_len, message, message_len,
+                                pre, pre_len, public_key) == 0;
 }
-

crypto/dilithium/p_pqdsa_test.cc

@@ -13,9 +13,6 @@
 #include "../fipsmodule/evp/internal.h"
 #include "../internal.h"
 #include "../fipsmodule/pqdsa/internal.h"
-
-#ifdef ENABLE_DILITHIUM
-
 #include "../test/file_test.h"
 #include "../test/test_util.h"
 #include "ml_dsa.h"
@@ -1518,13 +1515,3 @@ TEST_P(PQDSAParameterTest, ParsePublicKey) {
   bssl::UniquePtr<EVP_PKEY> pkey_from_der(EVP_parse_public_key(&cbs));
   ASSERT_TRUE(pkey_from_der);
 }
-
-#else
-
-TEST(PQDSATest, EvpDisabled) {
-  ASSERT_EQ(nullptr, EVP_PKEY_CTX_new_id(EVP_PKEY_NONE, nullptr));
-  bssl::UniquePtr<EVP_PKEY> pkey(EVP_PKEY_new());
-  ASSERT_FALSE(EVP_PKEY_set_type(pkey.get(), EVP_PKEY_NONE));
-}
-
-#endif

crypto/dilithium/pqcrystals_dilithium_ref_common/ntt.c

@@ -3,7 +3,7 @@
 #include "ntt.h"
 #include "reduce.h"
 
-static const int32_t zetas[N] = {
+static const int32_t zetas[ML_DSA_N] = {
          0,    25847, -2608894,  -518909,   237124,  -777960,  -876248,   466468,
    1826347,  2353451,  -359251, -2091905,  3119733, -2884855,  3111497,  2680103,
    2725464,  1024112, -1079900,  3585928,  -549488, -1119584,  2619752, -2108549,
@@ -39,24 +39,24 @@ static const int32_t zetas[N] = {
 };
 
 /*************************************************
-* Name:        ntt
+* Name:        ml_dsa_ntt
 *
 * Description: FIPS 204: Algorithm 41.
 *              Forward NTT, in-place. No modular reduction is performed after
 *              additions or subtractions. Output vector is in bitreversed order.
 *
 * Arguments:   - uint32_t p[N]: input/output coefficient array
 **************************************************/
-void ntt(int32_t a[N]) {
+void ml_dsa_ntt(int32_t a[ML_DSA_N]) {
   unsigned int len, start, j, k;
   int32_t zeta, t;
 
   k = 0;
   for(len = 128; len > 0; len >>= 1) {
-    for(start = 0; start < N; start = j + len) {
+    for(start = 0; start < ML_DSA_N; start = j + len) {
       zeta = zetas[++k];
       for(j = start; j < start + len; ++j) {
-        t = fqmul(zeta, a[j + len]);
+        t = ml_dsa_fqmul(zeta, a[j + len]);
         a[j + len] = a[j] - t;
         a[j] = a[j] + t;
       }
@@ -65,7 +65,7 @@ void ntt(int32_t a[N]) {
 }
 
 /*************************************************
-* Name:        invntt_tomont
+* Name:        ml_dsa_invntt_tomont
 *
 * Description: FIPS 204: Algorithm 42.
 *              Inverse NTT and multiplication by Montgomery factor 2^32.
@@ -76,25 +76,25 @@ void ntt(int32_t a[N]) {
 *
 * Arguments:   - uint32_t p[N]: input/output coefficient array
 **************************************************/
-void invntt_tomont(int32_t a[N]) {
+void ml_dsa_invntt_tomont(int32_t a[ML_DSA_N]) {
   unsigned int start, len, j, k;
   int32_t t, zeta;
   const int32_t f = 41978; // mont^2/256
 
   k = 256;
-  for(len = 1; len < N; len <<= 1) {
-    for(start = 0; start < N; start = j + len) {
+  for(len = 1; len < ML_DSA_N; len <<= 1) {
+    for(start = 0; start < ML_DSA_N; start = j + len) {
       zeta = -zetas[--k];
       for(j = start; j < start + len; ++j) {
         t = a[j];
         a[j] = t + a[j + len];
         a[j + len] = t - a[j + len];
-        a[j + len] = fqmul(zeta, a[j + len]);
+        a[j + len] = ml_dsa_fqmul(zeta, a[j + len]);
       }
     }
   }
 
-  for(j = 0; j < N; ++j) {
-    a[j] = fqmul(f, a[j]);
+  for(j = 0; j < ML_DSA_N; ++j) {
+    a[j] = ml_dsa_fqmul(f, a[j]);
   }
 }

crypto/dilithium/pqcrystals_dilithium_ref_common/ntt.h

@@ -1,11 +1,11 @@
-#ifndef NTT_H
-#define NTT_H
+#ifndef ML_DSA_NTT_H
+#define ML_DSA_NTT_H
 
 #include <stdint.h>
 #include "params.h"
 
-void ntt(int32_t a[N]);
+void ml_dsa_ntt(int32_t a[ML_DSA_N]);
 
-void invntt_tomont(int32_t a[N]);
+void ml_dsa_invntt_tomont(int32_t a[ML_DSA_N]);
 
 #endif