Skip to content

Fix ML-DSA internal MU tests #964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iomartin wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix ML-DSA internal MU tests #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfb74ea
ml-dsa: fix rnd being being reused from previous tests
iomartin Jun 1, 2026
f4c2b91
ml_dsa: fix signing for internal interface with externalMu=false
iomartin Jun 1, 2026
42c87c3
ml-dsa: test with both MU modes
iomartin Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/implementations/openssl/3/iut_ml_dsa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ int app_ml_dsa_handler(ACVP_TEST_CASE *test_case) {
msg_ptr = tc->mu;
msg_len = (size_t)tc->mu_len;
OSSL_PARAM_BLD_push_int(pbld, OSSL_SIGNATURE_PARAM_MU, 1);
} else if (tc->sig_interface == ACVP_SIG_INTERFACE_INTERNAL) {
// M' is passed as-is; disable pure encoding so OpenSSL computes mu = SHAKE-256(tr || M', 64)
msg_ptr = tc->msg;
msg_len = (size_t)tc->msg_len;
OSSL_PARAM_BLD_push_int(pbld, OSSL_SIGNATURE_PARAM_MESSAGE_ENCODING, 0);
} else {
msg_ptr = tc->msg;
msg_len = (size_t)tc->msg_len;
Expand Down Expand Up @@ -257,6 +262,11 @@ int app_ml_dsa_handler(ACVP_TEST_CASE *test_case) {
msg_ptr = tc->mu;
msg_len = (size_t)tc->mu_len;
OSSL_PARAM_BLD_push_int(pbld, OSSL_SIGNATURE_PARAM_MU, 1);
} else if (tc->sig_interface == ACVP_SIG_INTERFACE_INTERNAL) {
// M' is passed as-is; disable pure encoding so OpenSSL computes mu = SHAKE-256(tr || M', 64)
msg_ptr = tc->msg;
msg_len = (size_t)tc->msg_len;
OSSL_PARAM_BLD_push_int(pbld, OSSL_SIGNATURE_PARAM_MESSAGE_ENCODING, 0);
} else {
msg_ptr = tc->msg;
msg_len = (size_t)tc->msg_len;
Expand Down
4 changes: 2 additions & 2 deletions app/implementations/openssl/3/registrations/fp_350.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2467,7 +2467,7 @@ static int enable_ml_dsa(ACVP_CTX *ctx) {
CHECK_ENABLE_CAP_RV(rv);
rv = acvp_cap_ml_dsa_set_parm(ctx, ACVP_ML_DSA_SIGGEN, 0, ACVP_ML_DSA_PARAM_PREHASH, ACVP_SIG_PREHASH_NO);
CHECK_ENABLE_CAP_RV(rv);
rv = acvp_cap_ml_dsa_set_parm(ctx, ACVP_ML_DSA_SIGGEN, 0, ACVP_ML_DSA_PARAM_MU, ACVP_ML_DSA_MU_EXTERNAL);
rv = acvp_cap_ml_dsa_set_parm(ctx, ACVP_ML_DSA_SIGGEN, 0, ACVP_ML_DSA_PARAM_MU, ACVP_ML_DSA_MU_BOTH);
CHECK_ENABLE_CAP_RV(rv);
rv = acvp_cap_ml_dsa_set_parm(ctx, ACVP_ML_DSA_SIGGEN, 0, ACVP_ML_DSA_PARAM_PARAMETER_SET, ACVP_ML_DSA_PARAM_SET_ML_DSA_44);
CHECK_ENABLE_CAP_RV(rv);
Expand All @@ -2486,7 +2486,7 @@ static int enable_ml_dsa(ACVP_CTX *ctx) {
CHECK_ENABLE_CAP_RV(rv);
rv = acvp_cap_ml_dsa_set_parm(ctx, ACVP_ML_DSA_SIGVER, 0, ACVP_ML_DSA_PARAM_PREHASH, ACVP_SIG_PREHASH_NO);
CHECK_ENABLE_CAP_RV(rv);
rv = acvp_cap_ml_dsa_set_parm(ctx, ACVP_ML_DSA_SIGVER, 0, ACVP_ML_DSA_PARAM_MU, ACVP_ML_DSA_MU_EXTERNAL);
rv = acvp_cap_ml_dsa_set_parm(ctx, ACVP_ML_DSA_SIGVER, 0, ACVP_ML_DSA_PARAM_MU, ACVP_ML_DSA_MU_BOTH);
CHECK_ENABLE_CAP_RV(rv);
rv = acvp_cap_ml_dsa_set_parm(ctx, ACVP_ML_DSA_SIGVER, 0, ACVP_ML_DSA_PARAM_PARAMETER_SET, ACVP_ML_DSA_PARAM_SET_ML_DSA_44);
CHECK_ENABLE_CAP_RV(rv);
Expand Down
4 changes: 3 additions & 1 deletion src/acvp_ml_dsa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,9 @@ ACVP_RESULT acvp_ml_dsa_kat_handler(ACVP_CTX *ctx, JSON_Object *obj) {
goto err;
}

if (!is_deterministic) {
if (is_deterministic) {
rnd_str = NULL;
} else {
rv = acvp_tc_json_get_string(ctx, alg_id, testobj, "rnd", &rnd_str);
if (rv != ACVP_SUCCESS) {
goto err;
Expand Down