WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix wrap/unwrap negative test case for expected error code. Fix spelling on "mechanism". Document tests.

David Garske 2023-11-02 16:53:57 -07:00
parent b830daaf99
commit 3ca222633a
5 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/README.md 100644
View File

@ -0,0 +1,6 @@
## wolfPKCS11 Tests
The test files have the following purposes:
* `pkcs11test.c`: is the standard tests
* `pkcs11mtt.c`: is the multithreaded tests
* `pkcs11str.c`: is a storage test

3
tests/include.am
View File

@ -23,4 +23,5 @@ tests_pkcs11str_LDADD += src/libwolfpkcs11.la
endif
EXTRA_DIST += tests/unit.h \
tests/testdata.h
tests/testdata.h \
tests/README.md

15
tests/pkcs11mtt.c
View File

@ -1316,7 +1316,7 @@ static CK_RV test_sign_verify(void* args)
mech.mechanism = CKM_AES_CBC;
ret = funcList->C_SignInit(session, &mech, key);
CHECK_CKR_FAIL(ret, CKR_MECHANISM_INVALID,
"HMAC Sign Init wrong mechansim");
"HMAC Sign Init wrong mechanism");
mech.mechanism = CKM_SHA256_HMAC;
}
if (ret == CKR_OK) {
@ -1382,7 +1382,7 @@ static CK_RV test_sign_verify(void* args)
mech.mechanism = CKM_AES_CBC;
ret = funcList->C_VerifyInit(session, &mech, key);
CHECK_CKR_FAIL(ret, CKR_MECHANISM_INVALID,
"HMAC Verify Init wrong mechansim");
"HMAC Verify Init wrong mechanism");
mech.mechanism = CKM_SHA256_HMAC;
}
if (ret == CKR_OK) {
@ -1847,7 +1847,7 @@ static CK_RV test_wrap_unwrap_key(void* args)
if (ret == CKR_OK) {
ret = funcList->C_WrapKey(session, &mech, CK_INVALID_HANDLE, key,
wrappedKey, &wrappedKeyLen);
CHECK_CKR_FAIL(ret, CKR_OBJECT_HANDLE_INVALID,
CHECK_CKR_FAIL(ret, CKR_WRAPPING_KEY_HANDLE_INVALID,
"Wrap Key invalid wrapping key handle");
}
if (ret == CKR_OK) {
@ -1864,10 +1864,9 @@ static CK_RV test_wrap_unwrap_key(void* args)
if (ret == CKR_OK) {
ret = funcList->C_WrapKey(session, &mech, wrappingKey, key, wrappedKey,
&wrappedKeyLen);
CHECK_CKR_FAIL(ret, CKR_MECHANISM_INVALID,
"Wrap Key mechansim not supported");
CHECK_CKR_FAIL(ret, CKR_KEY_NOT_WRAPPABLE,
"Wrap Key mechanism not supported");
}
if (ret == CKR_OK) {
ret = funcList->C_UnwrapKey(CK_INVALID_HANDLE, &mech, wrappingKey,
wrappedKey, wrappedKeyLen, tmpl, tmplCnt,
@ -1884,7 +1883,7 @@ static CK_RV test_wrap_unwrap_key(void* args)
ret = funcList->C_UnwrapKey(session, &mech, CK_INVALID_HANDLE,
wrappedKey, wrappedKeyLen, tmpl, tmplCnt,
&key);
CHECK_CKR_FAIL(ret, CKR_OBJECT_HANDLE_INVALID,
CHECK_CKR_FAIL(ret, CKR_UNWRAPPING_KEY_HANDLE_INVALID,
"Unwrap Key invalid wrapping key handle");
}
if (ret == CKR_OK) {
@ -1912,7 +1911,7 @@ static CK_RV test_wrap_unwrap_key(void* args)
ret = funcList->C_UnwrapKey(session, &mech, wrappingKey, wrappedKey,
wrappedKeyLen, tmpl, tmplCnt, &key);
CHECK_CKR_FAIL(ret, CKR_MECHANISM_INVALID,
"Unwrap Key mechansim not supported");
"Unwrap Key mechanism not supported");
}
funcList->C_DestroyObject(session, wrappingKey);

16
tests/pkcs11test.c
View File

@ -560,7 +560,7 @@ static CK_RV test_slot(void* args)
if (ret == CKR_OK) {
for (i = 0; ret == CKR_OK && i < (int)count; i++) {
ret = funcList->C_GetMechanismInfo(slot, list[i], &info);
CHECK_CKR(ret, "Get Mechansim info");
CHECK_CKR(ret, "Get mechanism info");
}
}
@ -2146,7 +2146,7 @@ static CK_RV test_sign_verify(void* args)
mech.mechanism = CKM_AES_CBC;
ret = funcList->C_SignInit(session, &mech, key);
CHECK_CKR_FAIL(ret, CKR_MECHANISM_INVALID,
"HMAC Sign Init wrong mechansim");
"HMAC Sign Init wrong mechanism");
mech.mechanism = CKM_SHA256_HMAC;
}
if (ret == CKR_OK) {
@ -2212,7 +2212,7 @@ static CK_RV test_sign_verify(void* args)
mech.mechanism = CKM_AES_CBC;
ret = funcList->C_VerifyInit(session, &mech, key);
CHECK_CKR_FAIL(ret, CKR_MECHANISM_INVALID,
"HMAC Verify Init wrong mechansim");
"HMAC Verify Init wrong mechanism");
mech.mechanism = CKM_SHA256_HMAC;
}
if (ret == CKR_OK) {
@ -2668,7 +2668,7 @@ static CK_RV test_wrap_unwrap_key(void* args)
if (ret == CKR_OK) {
ret = funcList->C_WrapKey(session, &mech, CK_INVALID_HANDLE, key,
wrappedKey, &wrappedKeyLen);
CHECK_CKR_FAIL(ret, CKR_OBJECT_HANDLE_INVALID,
CHECK_CKR_FAIL(ret, CKR_WRAPPING_KEY_HANDLE_INVALID,
"Wrap Key invalid wrapping key handle");
}
if (ret == CKR_OK) {
@ -2685,8 +2685,8 @@ static CK_RV test_wrap_unwrap_key(void* args)
if (ret == CKR_OK) {
ret = funcList->C_WrapKey(session, &mech, wrappingKey, key, wrappedKey,
&wrappedKeyLen);
CHECK_CKR_FAIL(ret, CKR_MECHANISM_INVALID,
"Wrap Key mechansim not supported");
CHECK_CKR_FAIL(ret, CKR_KEY_NOT_WRAPPABLE,
"Wrap Key mechanism not supported");
}
if (ret == CKR_OK) {
@ -2705,7 +2705,7 @@ static CK_RV test_wrap_unwrap_key(void* args)
ret = funcList->C_UnwrapKey(session, &mech, CK_INVALID_HANDLE,
wrappedKey, wrappedKeyLen, tmpl, tmplCnt,
&key);
CHECK_CKR_FAIL(ret, CKR_OBJECT_HANDLE_INVALID,
CHECK_CKR_FAIL(ret, CKR_UNWRAPPING_KEY_HANDLE_INVALID,
"Unwrap Key invalid wrapping key handle");
}
if (ret == CKR_OK) {
@ -2733,7 +2733,7 @@ static CK_RV test_wrap_unwrap_key(void* args)
ret = funcList->C_UnwrapKey(session, &mech, wrappingKey, wrappedKey,
wrappedKeyLen, tmpl, tmplCnt, &key);
CHECK_CKR_FAIL(ret, CKR_MECHANISM_INVALID,
"Unwrap Key mechansim not supported");
"Unwrap Key mechanism not supported");
}
return ret;

2
wolfpkcs11/internal.h
View File

@ -386,7 +386,7 @@ int WP11_AesGcm_DecryptFinal(unsigned char* dec, word32* decSz,
WP11_Object* secret, WP11_Session* session);
int WP11_Hmac_SigLen(WP11_Session* session);
int WP11_Hmac_Init(CK_MECHANISM_TYPE mechansim, WP11_Object* secret,
int WP11_Hmac_Init(CK_MECHANISM_TYPE mechanism, WP11_Object* secret,
WP11_Session* session);
int WP11_Hmac_Sign(unsigned char* data, word32 dataLen, unsigned char* sig,
word32* sigLen, WP11_Session* session);