Skip to content
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

Fix decode cert when store is enabled for login/logout reuse scenario #39

Merged
merged 2 commits into from
Dec 17, 2024
Merged

Fix decode cert when store is enabled for login/logout reuse scenario #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6055b9
Fix decode cert when store is enabled for login/logout reuse scenario
ColtonWilley Dec 17, 2024
6a2a80d
Restore accidentally modified add_cert example to original
ColtonWilley Dec 17, 2024
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: 9 additions & 4 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1628,9 +1628,10 @@ static int wp11_Object_Store_Cert(WP11_Object* object, int tokenId, int objId)
*/
static void wp11_Object_Decode_Cert(WP11_Object* object)
{
object->data.cert.data = object->keyData;
object->data.cert.len = object->keyDataLen;
object->keyData = NULL;
if (object->data.cert.data == NULL) {
object->data.cert.data = object->keyData;
object->data.cert.len = object->keyDataLen;
}
object->encoded = 0;
}

Expand Down Expand Up @@ -4952,6 +4953,7 @@ void WP11_Session_FindFinal(WP11_Session* session)
*/
void WP11_Object_Free(WP11_Object* object)
{
int certFreed = 0;
#ifdef WOLFPKCS11_TPM
wolfTPM2_UnloadHandle(&object->slot->tpmDev, &object->tpmKey.handle);
#endif
Expand All @@ -4963,6 +4965,7 @@ void WP11_Object_Free(WP11_Object* object)
XFREE(object->keyId, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (object->objClass == CKO_CERTIFICATE) {
XFREE(object->data.cert.data, NULL, DYNAMIC_TYPE_CERT);
certFreed = 1;
}
else {
#ifndef NO_RSA
Expand All @@ -4982,8 +4985,10 @@ void WP11_Object_Free(WP11_Object* object)
}

#ifndef WOLFPKCS11_NO_STORE
if (object->keyData != NULL)
if (object->keyData != NULL && certFreed == 0)
XFREE(object->keyData, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#else
(void)certFreed;
#endif

/* Dispose of object. */
Expand Down
59 changes: 59 additions & 0 deletions tests/pkcs11test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7581,6 +7581,7 @@ static CK_RV test_hmac_sha512_fail(void* args)
static CK_RV test_x509(void* args)
{
CK_RV ret = CKR_OK;
int sessFlags = CKF_SERIAL_SESSION | CKF_RW_SESSION;
CK_SESSION_HANDLE session = *(CK_SESSION_HANDLE*)args;
CK_CERTIFICATE_TYPE certType = CKC_X_509;
CK_UTF8CHAR label[] = "A certificate object";
Expand Down Expand Up @@ -7733,6 +7734,11 @@ static CK_RV test_x509(void* args)
{ CKA_VALUE, NULL, 0 }
};
CK_ULONG getTmplCnt = sizeof(getTmpl) / sizeof(*getTmpl);
CK_ATTRIBUTE findTmpl[] = {
{ CKA_ID, id, sizeof(id)}
};
CK_ULONG findTmplCnt = sizeof(findTmpl) / sizeof(*findTmpl);
CK_ULONG count = 1;

ret = funcList->C_CreateObject(session, tmpl, tmplCnt, &obj);
CHECK_CKR(ret, "Create certificate object");
Expand Down Expand Up @@ -7762,8 +7768,61 @@ static CK_RV test_x509(void* args)
XFREE(getTmpl[0].pValue, NULL, DYNAMIC_TYPE_TMP_BUFFER);
}
}
}

/* Do a login/logout cycle and check that the value still matches */
if (userPinLen != 0)
funcList->C_Logout(session);
funcList->C_CloseSession(session);

ret = funcList->C_OpenSession(slot, sessFlags, NULL, NULL, &session);
CHECK_CKR(ret, "Open Session");
if (ret == CKR_OK && userPinLen != 0) {
ret = funcList->C_Login(session, CKU_USER, userPin, userPinLen);
CHECK_CKR(ret, "Login");
}

ret = funcList->C_FindObjectsInit(session, findTmpl, findTmplCnt);
CHECK_CKR(ret, "C_FindObjectsInit");
if (ret == CKR_OK) {
ret = funcList->C_FindObjects(session, &obj, 1, &count);
CHECK_CKR(ret, "C_FindObjects");
if (ret == CKR_OK) {
ret = funcList->C_FindObjectsFinal(session);
CHECK_CKR(ret, "C_FindObjectsFinal");
}
}

if (ret == CKR_OK) {
getTmpl[0].pValue = NULL;
getTmpl[0].ulValueLen = 0;
ret = funcList->C_GetAttributeValue(session, obj, getTmpl, getTmplCnt);
CHECK_CKR(ret, "C_GetAttributeValue");
if (ret == CKR_OK) {
getTmpl[0].pValue = XMALLOC(getTmpl[0].ulValueLen * sizeof(byte),
NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (getTmpl[0].pValue == NULL)
ret = CKR_DEVICE_MEMORY;
CHECK_CKR(ret, "Allocate get attribute memory");

if (ret == CKR_OK) {
ret = funcList->C_GetAttributeValue(session, obj, getTmpl, getTmplCnt);
CHECK_CKR(ret, "C_GetAttributeValue");

if (sizeof(certificate) != getTmpl[0].ulValueLen) {
ret = CKR_GENERAL_ERROR;
}
if (XMEMCMP(certificate, getTmpl[0].pValue, sizeof(certificate)) != 0) {
ret = CKR_GENERAL_ERROR;
}
CHECK_CKR(ret, "Verify that stored cert matches original");

XFREE(getTmpl[0].pValue, NULL, DYNAMIC_TYPE_TMP_BUFFER);
}
}
ret = funcList->C_DestroyObject(session, obj);
}

return ret;
}

Expand Down
Loading