Skip to content

Fix PKCS11 object leak in Pkcs11ECDH #9780

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
mattia-moffa wants to merge 3 commits into
base: master
Choose a base branch
from
+49 −6
Open

Fix PKCS11 object leak in Pkcs11ECDH #9780

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
cd51786
Fix PKCS11 object leak in Pkcs11ECDH
mattia-moffa Feb 16, 2026
1707ace
Bind PKCS11 ECC key duration to ECC object
mattia-moffa Feb 17, 2026
817523d
Adjust execution flow
mattia-moffa Feb 18, 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
7 changes: 7 additions & 0 deletions wolfcrypt/src/ecc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7891,6 +7891,13 @@ int wc_ecc_free(ecc_key* key)
return 0;
}

#if defined(WOLF_CRYPTO_CB) && defined(WOLF_CRYPTO_CB_FREE)
if (key->devId != INVALID_DEVID) {
wc_CryptoCb_Free(key->devId, WC_ALGO_TYPE_PK,
WC_PK_TYPE_EC_KEYGEN, key);
}
#endif

#if defined(WOLFSSL_ECDSA_SET_K) || defined(WOLFSSL_ECDSA_SET_K_ONE_LOOP) || \
defined(WOLFSSL_ECDSA_DETERMINISTIC_K) || \
defined(WOLFSSL_ECDSA_DETERMINISTIC_K_VARIANT)
Expand Down
45 changes: 39 additions & 6 deletions wolfcrypt/src/wc_pkcs11.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2923,8 +2923,12 @@ static int Pkcs11EcKeyGen(Pkcs11Session* session, wc_CryptoInfo* info)

if (pubKey != NULL_PTR)
session->func->C_DestroyObject(session->handle, pubKey);
if (ret != 0 && privKey != NULL_PTR)
if (ret == 0 && privKey != NULL_PTR) {
key->devCtx = (void*)(uintptr_t)privKey;
}
else if (ret != 0 && privKey != NULL_PTR) {
session->func->C_DestroyObject(session->handle, privKey);
}

return ret;
}
Expand Down Expand Up @@ -3020,7 +3024,11 @@ static int Pkcs11ECDH(Pkcs11Session* session, wc_CryptoInfo* info)
if (ret == 0) {
WOLFSSL_MSG("PKCS#11: EC Key Derivation Operation");

if ((sessionKey = !mp_iszero(
if (info->pk.ecdh.private_key->devCtx != NULL) {
privateKey = (CK_OBJECT_HANDLE)(uintptr_t)
info->pk.ecdh.private_key->devCtx;
}
else if ((sessionKey = !mp_iszero(
wc_ecc_key_get_priv(info->pk.ecdh.private_key))))
ret = Pkcs11CreateEccPrivateKey(&privateKey, session,
info->pk.ecdh.private_key, CKA_DERIVE);
Expand Down Expand Up @@ -3085,7 +3093,10 @@ static int Pkcs11ECDH(Pkcs11Session* session, wc_CryptoInfo* info)
info->pk.ecdh.outlen);
}

if (sessionKey)
if (secret != CK_INVALID_HANDLE)
session->func->C_DestroyObject(session->handle, secret);

if (sessionKey && privateKey != NULL_PTR)
session->func->C_DestroyObject(session->handle, privateKey);

if (point != NULL)
Expand Down Expand Up @@ -3314,7 +3325,11 @@ static int Pkcs11ECDSA_Sign(Pkcs11Session* session, wc_CryptoInfo* info)
if (ret == 0) {
WOLFSSL_MSG("PKCS#11: EC Signing Operation");

if ((sessionKey = !mp_iszero(
if (info->pk.eccsign.key->devCtx != NULL) {
privateKey = (CK_OBJECT_HANDLE)(uintptr_t)
info->pk.eccsign.key->devCtx;
}
else if ((sessionKey = !mp_iszero(
wc_ecc_key_get_priv(info->pk.eccsign.key))))
ret = Pkcs11CreateEccPrivateKey(&privateKey, session,
info->pk.eccsign.key, CKA_SIGN);
Expand Down Expand Up @@ -3378,7 +3393,7 @@ static int Pkcs11ECDSA_Sign(Pkcs11Session* session, wc_CryptoInfo* info)
sz);
}

if (sessionKey)
if (sessionKey && privateKey != NULL_PTR)
session->func->C_DestroyObject(session->handle, privateKey);

return ret;
Expand Down Expand Up @@ -4726,8 +4741,26 @@ int wc_Pkcs11_CryptoDevCb(int devId, wc_CryptoInfo* info, void* ctx)
ret = NOT_COMPILED_IN;
#endif
}
else
else if (info->algo_type == WC_ALGO_TYPE_FREE) {
#ifdef HAVE_ECC
if (info->free.algo == WC_ALGO_TYPE_PK &&
info->free.type == WC_PK_TYPE_EC_KEYGEN) {
ecc_key* key = (ecc_key*)info->free.obj;
if (key != NULL && key->devCtx != NULL) {
if (token->handle != NULL_PTR) {
CK_OBJECT_HANDLE handle =
(CK_OBJECT_HANDLE)(uintptr_t)key->devCtx;
token->func->C_DestroyObject(token->handle, handle);
}
key->devCtx = NULL;
}
ret = 0;
}
#endif
}
else {
ret = NOT_COMPILED_IN;
}
}

return ret;
Expand Down
3 changes: 3 additions & 0 deletions wolfssl/wolfcrypt/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4962,6 +4962,9 @@ extern void uITRON4_free(void *p) ;
" (WC_TEST_NO_CRYPTOCB_SW_TEST)" \
" requires WOLF_CRYPTO_CB"
#endif
#if defined(HAVE_PKCS11) && !defined(WOLF_CRYPTO_CB_FREE)
#define WOLF_CRYPTO_CB_FREE
#endif
#if (defined(WOLF_CRYPTO_CB_COPY) || defined(WOLF_CRYPTO_CB_FREE)) && \
!defined(WOLF_CRYPTO_CB)
#error "Crypto callback utilities" \
Expand Down