Skip to content

Fix LMS and XMSS cryptocb software fallback #10456

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

Merged
SparkiDev merged 1 commit into from
May 13, 2026
Merged

Fix LMS and XMSS cryptocb software fallback #10456

Show file tree
Hide file tree
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
13 changes: 7 additions & 6 deletions wolfcrypt/src/wc_lms.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,15 +1422,16 @@ int wc_LmsKey_SigsLeft(LmsKey* key)
if (cbRet == 0) {
return (sigsLeft != 0) ? 1 : 0;
}
/* The device owns the private state; no safe software fallback
* exists because key->priv_raw does not reflect HSM state. */
if (cbRet != WC_NO_ERR_TRACE(CRYPTOCB_UNAVAILABLE)) {
/* Device returned an actual error; the device owns the
* private state so no safe software fallback exists. */
WOLFSSL_MSG("PqcStatefulSigSigsLeft returned an error");
return 0;
}
else {
WOLFSSL_MSG("LMS SigsLeft not supported by device");
}
return 0;
/* Cryptocb declined. priv_raw reflects software state from the
* CRYPTOCB_UNAVAILABLE fall-through in MakeKey/Reload, so the
* software check below is valid. */
WOLFSSL_MSG("LMS SigsLeft not supported by device, using software");
}
#endif
ret = wc_hss_sigsleft(key->params, key->priv_raw);
Expand Down
13 changes: 7 additions & 6 deletions wolfcrypt/src/wc_xmss.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,15 +1521,16 @@ int wc_XmssKey_SigsLeft(XmssKey* key)
if (cbRet == 0) {
return (sigsLeft != 0) ? 1 : 0;
}
/* The device owns the private state; no safe software fallback
* exists because key->sk does not reflect HSM state. */
if (cbRet != WC_NO_ERR_TRACE(CRYPTOCB_UNAVAILABLE)) {
/* Device returned an actual error; the device owns the
* private state so no safe software fallback exists. */
WOLFSSL_MSG("PqcStatefulSigSigsLeft returned an error");
return 0;
}
else {
WOLFSSL_MSG("XMSS SigsLeft not supported by device");
}
return 0;
/* Cryptocb declined. Fall through to the software path: state
* reflects the CRYPTOCB_UNAVAILABLE fall-through in MakeKey/Reload,
* and read_private_key can repopulate sk from NV storage. */
WOLFSSL_MSG("XMSS SigsLeft not supported by device, using software");
}
#endif

Expand Down
Loading