Skip to content

Fix private key lock issues in master #10446

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
douzzer merged 1 commit into from
May 9, 2026
+16 −2
Merged

Fix private key lock issues in master #10446

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
9 changes: 8 additions & 1 deletion src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31059,11 +31059,18 @@ static int DecodePrivateKey_ex(WOLFSSL *ssl, byte keyType, const DerBuffer* key,

/* Set start of data to beginning of buffer. */
idx = 0;
/* Decode the key assuming it is a Dilithium private key. */
/* Decode the key assuming it is a Dilithium private key. The FIPS
* wrapper for wc_dilithium_import_private gates on the per-thread
* privateKeyReadEnable flag, which is unset by default in any
* thread that hasn't called PRIVATE_KEY_UNLOCK(). Without the
* bracket, decoding a Dilithium/ML-DSA private key from a
* handshake worker thread fails with FIPS_PRIVATE_KEY_LOCKED_E. */
PRIVATE_KEY_UNLOCK();
ret = wc_Dilithium_PrivateKeyDecode(key->buffer,
&idx,
(dilithium_key*)*hsKey,
key->length);
PRIVATE_KEY_LOCK();
if (ret == 0) {
WOLFSSL_MSG("Using Dilithium private key");

Expand Down
9 changes: 8 additions & 1 deletion src/ssl_load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,10 +956,17 @@ static int ProcessBufferTryDecodeDilithium(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
/* Initialize Dilithium key. */
ret = wc_dilithium_init(key);
if (ret == 0) {
/* Decode as a Dilithium private key. */
/* Decode as a Dilithium private key. The FIPS wrapper for
* wc_dilithium_import_private gates on the per-thread
* privateKeyReadEnable flag, which is unset by default in any
* thread that hasn't called PRIVATE_KEY_UNLOCK(). Without the
* bracket, loading a Dilithium/ML-DSA private key from a
* worker thread fails with FIPS_PRIVATE_KEY_LOCKED_E. */
idx = 0;
PRIVATE_KEY_UNLOCK();
ret = wc_Dilithium_PrivateKeyDecode(der->buffer, &idx, key,
der->length);
PRIVATE_KEY_LOCK();
if (ret == 0) {
ret = dilithium_get_oid_sum(key, &keyFormatTemp);
if (ret == 0) {
Expand Down
Loading