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

xtest: pkcs11: fix false positive error report on CKR_HOST_MEMORY #711

Merged
merged 1 commit into from
Nov 22, 2023
+6 −5
Merged

xtest: pkcs11: fix false positive error report on CKR_HOST_MEMORY #711

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
11 changes: 6 additions & 5 deletions host/xtest/pkcs11_1000.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,8 @@ static void test_create_destroy_session_objects(ADBG_Case_t *c)
ARRAY_SIZE(cktest_session_object),
obj_hdl + n);

if (rv == CKR_DEVICE_MEMORY || !ADBG_EXPECT_CK_OK(c, rv))
if (rv == CKR_DEVICE_MEMORY || rv == CKR_HOST_MEMORY ||
!ADBG_EXPECT_CK_OK(c, rv))
break;
}

Expand Down Expand Up @@ -1654,13 +1655,13 @@ static CK_RV open_cipher_session(ADBG_Case_t *c,
}

rv = C_OpenSession(slot, session_flags, NULL, 0, session);
if (rv == CKR_DEVICE_MEMORY)
if (rv == CKR_DEVICE_MEMORY || rv == CKR_HOST_MEMORY)
return rv;
if (!ADBG_EXPECT_CK_OK(c, rv))
return rv;

rv = C_CreateObject(*session, attr_key, attr_count, &object);
if (rv == CKR_DEVICE_MEMORY)
if (rv == CKR_DEVICE_MEMORY || rv == CKR_HOST_MEMORY)
return rv;
if (!ADBG_EXPECT_CK_OK(c, rv))
return rv;
Expand All @@ -1670,7 +1671,7 @@ static CK_RV open_cipher_session(ADBG_Case_t *c,
if (mode == TEE_MODE_DECRYPT)
rv = C_DecryptInit(*session, mechanism, object);

if (rv == CKR_DEVICE_MEMORY)
if (rv == CKR_DEVICE_MEMORY || rv == CKR_HOST_MEMORY)
return rv;
if (!ADBG_EXPECT_CK_OK(c, rv))
return CKR_GENERAL_ERROR;
Expand Down Expand Up @@ -1701,7 +1702,7 @@ static void xtest_pkcs11_test_1007(ADBG_Case_t *c)
TEE_MODE_ENCRYPT);

/* Failure due to memory allocation is not a error case */
if (rv == CKR_DEVICE_MEMORY)
if (rv == CKR_DEVICE_MEMORY || rv == CKR_HOST_MEMORY)
break;

if (!ADBG_EXPECT_CK_OK(c, rv))
Expand Down