Skip to content

Route wc_MlDsaKey_SignCtx through the crypto callback before the prvKeySet check for device keys #10979

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
aidangarske wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −3
Open

Route wc_MlDsaKey_SignCtx through the crypto callback before the prvKeySet check for device keys #10979

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions wolfcrypt/src/wc_mldsa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10319,11 +10319,10 @@ int wc_MlDsaKey_SignCtx(wc_MlDsaKey* key, const byte* ctx, byte ctxLen,
if ((ret == 0) && (ctx == NULL) && (ctxLen > 0)) {
ret = BAD_FUNC_ARG;
}
if ((ret == 0) && (!key->prvKeySet)) {
ret = BAD_FUNC_ARG;
}

#ifdef WOLF_CRYPTO_CB
/* A device/id-backed key has no local private material (prvKeySet == 0), so
* dispatch to the callback before the prvKeySet check. */
if (ret == 0) {
#ifndef WOLF_CRYPTO_CB_FIND
if (key->devId != INVALID_DEVID)
Expand All @@ -10339,6 +10338,10 @@ int wc_MlDsaKey_SignCtx(wc_MlDsaKey* key, const byte* ctx, byte ctxLen,
}
#endif

if ((ret == 0) && (!key->prvKeySet)) {
ret = BAD_FUNC_ARG;
}

if (ret == 0) {
/* Sign message. */
ret = mldsa_sign_ctx_msg(key, rng, ctx, ctxLen, msg, msgLen, sig,
Expand Down
Loading