public/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MLDSA: Fix no-ml-dsa configure option.

Browse source 
Added to 'bulk' group and CI

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26654)
This commit is contained in:
slontis 2025-02-07 07:52:27 +11:00 • committed by Tomas Mraz
parent cc699ace92
commit dd1d010130
5 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Configure
View file

@ -623,7 +623,7 @@ my @disable_cascades = (
"ec", "engine",
"filenames",
"idea", "ktls",
"md4", "multiblock", "nextprotoneg",
"md4", "ml-dsa", "multiblock", "nextprotoneg",
"ocsp", "ocb", "poly1305", "psk",
"rc2", "rc4", "rmd160",
"seed", "siphash", "siv",

2
crypto/ml_dsa/build.info
View file

@ -4,7 +4,7 @@ $COMMON=ml_dsa_encoders.c ml_dsa_key_compress.c ml_dsa_key.c \
ml_dsa_matrix.c ml_dsa_ntt.c ml_dsa_params.c ml_dsa_sample.c \
ml_dsa_sign.c
IF[{- !$disabled{'ml_dsa'} -}]
IF[{- !$disabled{'ml-dsa'} -}]
SOURCE[../../libcrypto]=$COMMON
SOURCE[../../providers/libfips.a]=$COMMON
ENDIF

6
providers/fips/self_test_kats.c
View file

@ -567,6 +567,7 @@ err:
return ret;
}
#ifndef OPENSSL_NO_ML_DSA
/*
* Test that a deterministic key generation produces the correct key
*/
@ -621,6 +622,7 @@ err:
OSSL_SELF_TEST_onend(st, ret);
return ret;
}
#endif /* OPENSSL_NO_ML_DSA */
/*
* Test a data driven list of KAT's for digest algorithms.
@ -839,6 +841,7 @@ static int setup_main_random(OSSL_LIB_CTX *libctx)
static int self_test_asym_keygens(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
{
#ifndef OPENSSL_NO_ML_DSA
int i, ret = 1;
for (i = 0; i < (int)OSSL_NELEM(st_kat_asym_keygen_tests); ++i) {
@ -846,6 +849,9 @@ static int self_test_asym_keygens(OSSL_SELF_TEST *st, OSSL_LIB_CTX *libctx)
ret = 0;
}
return ret;
#else
return 1;
#endif /* OPENSSL_NO_ML_DSA */
}
/*

10
providers/implementations/encode_decode/ml_dsa_codecs.h
View file

@ -11,9 +11,10 @@
# define PROV_ML_DSA_CODECS_H
# pragma once
# include <openssl/e_os2.h>
# include "crypto/ml_dsa.h"
# include "prov/provider_ctx.h"
# ifndef OPENSSL_NO_ML_DSA
# include <openssl/e_os2.h>
# include "crypto/ml_dsa.h"
# include "prov/provider_ctx.h"
/*-
* The DER ASN.1 encoding of ML-KEM (and ML-DSA) public keys prepends 22 bytes
@ -26,7 +27,7 @@
* - 4 byte bit string tag and length
* - 1 bitstring lead byte
*/
# define ML_DSA_SPKI_OVERHEAD 22
# define ML_DSA_SPKI_OVERHEAD 22
typedef struct {
const uint8_t asn1_prefix[ML_DSA_SPKI_OVERHEAD];
} ML_DSA_SPKI_FMT;
@ -100,4 +101,5 @@ __owur
int ossl_ml_dsa_i2d_prvkey(const ML_DSA_KEY *key, unsigned char **out,
PROV_CTX *provctx);
# endif /* OPENSSL_NO_ML_DSA */
#endif /* PROV_ML_DSA_CODECS_H */

16
test/endecode_test.c
View file

@ -1066,14 +1066,14 @@ IMPLEMENT_TEST_SUITE_UNPROTECTED_PVK(RSA, "RSA")
IMPLEMENT_TEST_SUITE_PROTECTED_PVK(RSA, "RSA")
#endif
#ifndef OPENSSL_ML_DSA
#ifndef OPENSSL_NO_ML_DSA
KEYS(ML_DSA_44);
KEYS(ML_DSA_65);
KEYS(ML_DSA_87);
IMPLEMENT_TEST_SUITE(ML_DSA_44, "ML-DSA-44", 1)
IMPLEMENT_TEST_SUITE(ML_DSA_65, "ML-DSA-65", 1)
IMPLEMENT_TEST_SUITE(ML_DSA_87, "ML-DSA-87", 1)
#endif /* OPENSSL_ML_DSA */
#endif /* OPENSSL_NO_ML_DSA */
#ifndef OPENSSL_NO_EC
/* Explicit parameters that match a named curve */
@ -1420,13 +1420,13 @@ int setup_tests(void)
MAKE_KEYS(X25519, "X25519", NULL);
MAKE_KEYS(X448, "X448", NULL);
#endif
#ifndef OPENSSL_ML_DSA
#ifndef OPENSSL_NO_ML_DSA
if (!is_fips_lt_3_5) {
MAKE_KEYS(ML_DSA_44, "ML-DSA-44", NULL);
MAKE_KEYS(ML_DSA_65, "ML-DSA-65", NULL);
MAKE_KEYS(ML_DSA_87, "ML-DSA-87", NULL);
}
#endif /* OPENSSL_ML_DSA */
#endif /* OPENSSL_NO_ML_DSA */
TEST_info("Loading RSA key...");
ok = ok && TEST_ptr(key_RSA = load_pkey_pem(rsa_file, keyctx));
@ -1497,13 +1497,13 @@ int setup_tests(void)
ADD_TEST_SUITE_PROTECTED_PVK(RSA);
# endif
#ifndef OPENSSL_ML_DSA
#ifndef OPENSSL_NO_ML_DSA
if (!is_fips_lt_3_5) {
ADD_TEST_SUITE(ML_DSA_44);
ADD_TEST_SUITE(ML_DSA_65);
ADD_TEST_SUITE(ML_DSA_87);
}
#endif /* OPENSSL_ML_DSA */
#endif /* OPENSSL_NO_ML_DSA */
}
return 1;
@ -1551,13 +1551,13 @@ void cleanup_tests(void)
FREE_KEYS(RSA);
FREE_KEYS(RSA_PSS);
#ifndef OPENSSL_ML_DSA
#ifndef OPENSSL_NO_ML_DSA
if (!is_fips_lt_3_5) {
FREE_KEYS(ML_DSA_44);
FREE_KEYS(ML_DSA_65);
FREE_KEYS(ML_DSA_87);
}
#endif /* OPENSSL_ML_DSA */
#endif /* OPENSSL_NO_ML_DSA */
OSSL_PROVIDER_unload(nullprov);
OSSL_PROVIDER_unload(deflprov);