wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-07 04:10:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix PKCS11 object leak in Pkcs11ECDH

Browse Source
This commit is contained in:
Mattia Moffa
2026-02-16 18:48:51 +01:00
parent 4fe05d7fe0
commit cd51786512
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/wc_pkcs11.c
+22 -1
View File
@@ -2994,6 +2994,7 @@ static int Pkcs11ECDH(Pkcs11Session* session, wc_CryptoInfo* info)
{
int ret = 0;
int sessionKey = 0;
int destroyPrivKey = 0;
unsigned char* point = NULL;
word32 pointLen;
CK_RV rv;
@@ -3038,6 +3039,11 @@ static int Pkcs11ECDH(Pkcs11Session* session, wc_CryptoInfo* info)
else {
ret = Pkcs11FindEccKey(&privateKey, CKO_PRIVATE_KEY, session,
info->pk.ecdh.public_key, CKA_DERIVE);
if (ret == 0) {
/* Key found by public key match is likely ephemeral (e.g. from
* Pkcs11EcKeyGen for ECDHE), clean it up after use. */
destroyPrivKey = 1;
}
}
}
if (ret == 0) {
@@ -3085,8 +3091,23 @@ 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) {
session->func->C_DestroyObject(session->handle, privateKey);
}
else if (destroyPrivKey && privateKey != NULL_PTR) {
/* Only destroy if the key is a non-persistent session object */
CK_BBOOL isToken = CK_FALSE;
CK_ATTRIBUTE tokenTmpl[] = {
{ CKA_TOKEN, &isToken, sizeof(isToken) },
};
if (session->func->C_GetAttributeValue(session->handle, privateKey,
tokenTmpl, 1) == CKR_OK && isToken == CK_FALSE) {
session->func->C_DestroyObject(session->handle, privateKey);
}
}
if (point != NULL)
XFREE(point, info->pk.ecdh.public_key->heap, DYNAMIC_TYPE_ECC_BUFFER);