feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Check FindObjectFinal call for error

Browse Source
This commit is contained in:
Sean Parkinson
2019-02-12 09:07:14 +10:00
parent e86aae00ed
commit 66ab6d8c22
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wolfcrypt/src/wc_pkcs11.c
View File

@ -650,7 +650,9 @@ static int Pkcs11FindKeyById(CK_OBJECT_HANDLE* key, CK_OBJECT_CLASS keyClass,
rv = session->func->C_FindObjects(session->handle, key, 1, &count); rv = session->func->C_FindObjects(session->handle, key, 1, &count);
if (rv != CKR_OK) if (rv != CKR_OK)
ret = WC_HW_E; ret = WC_HW_E;
session->func->C_FindObjectsFinal(session->handle); rv = session->func->C_FindObjectsFinal(session->handle);
if (rv != CKR_OK)
ret = WC_HW_E;
} }
if (ret == 0 && count == 0) if (ret == 0 && count == 0)
ret = WC_HW_E; ret = WC_HW_E;
@ -696,7 +698,9 @@ static int Pkcs11FindRsaKey(CK_OBJECT_HANDLE* key, CK_OBJECT_CLASS keyClass,
rv = session->func->C_FindObjects(session->handle, key, 1, &count); rv = session->func->C_FindObjects(session->handle, key, 1, &count);
if (rv != CKR_OK) if (rv != CKR_OK)
ret = WC_HW_E; ret = WC_HW_E;
session->func->C_FindObjectsFinal(session->handle); rv = session->func->C_FindObjectsFinal(session->handle);
if (rv != CKR_OK)
ret = WC_HW_E;
} }
return ret; return ret;
@ -1095,7 +1099,9 @@ static int Pkcs11FindEccKey(CK_OBJECT_HANDLE* key, CK_OBJECT_CLASS keyClass,
rv = session->func->C_FindObjects(session->handle, key, 1, &count); rv = session->func->C_FindObjects(session->handle, key, 1, &count);
if (rv != CKR_OK) if (rv != CKR_OK)
ret = WC_HW_E; ret = WC_HW_E;
session->func->C_FindObjectsFinal(session->handle); rv = session->func->C_FindObjectsFinal(session->handle);
if (rv != CKR_OK)
ret = WC_HW_E;
} }
if (ecPoint != NULL) if (ecPoint != NULL)