xtest: pkcs11_1xxx: fix type references in attribute arrays

Fixes type used to set Cryptoki attribute value cell size where an
explicit type is used whereas the referenced attribute local variable
could better be used for consistency of the implementation. By the way
this change also fixes an equivalent type size issue on memory allocation
in xtest_pkcs11_test_1001().

Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>

1 files changed, 156 insertions, 157 deletions

diff --git a/host/xtest/pkcs11_1000.c b/host/xtest/pkcs11_1000.c
index 89bedc3..3034d30 100644
--- a/host/xtest/pkcs11_1000.c
+++ b/host/xtest/pkcs11_1000.c
@@ -282,7 +282,7 @@ static void xtest_pkcs11_test_1001(ADBG_Case_t *c)
 					  present_slot_count))
 		goto out;
 
-	slot_ids = calloc(slot_count, sizeof(CK_SLOT_ID));
+	slot_ids = calloc(slot_count, sizeof(*slot_ids));
 	if (!ADBG_EXPECT_NOT_NULL(c, slot_ids))
 		goto out;
 
@@ -2487,9 +2487,9 @@ static CK_RV create_data_object(CK_SESSION_HANDLE session,
 {
 	CK_OBJECT_CLASS class = CKO_DATA;
 	CK_ATTRIBUTE object_template[] = {
-		{ CKA_CLASS, &class, sizeof(CK_OBJECT_CLASS) },
-		{ CKA_TOKEN, &token, sizeof(CK_BBOOL) },
-		{ CKA_PRIVATE, &private, sizeof(CK_BBOOL) },
+		{ CKA_CLASS, &class, sizeof(class) },
+		{ CKA_TOKEN, &token, sizeof(token) },
+		{ CKA_PRIVATE, &private, sizeof(private) },
 		{ CKA_LABEL, (CK_UTF8CHAR_PTR)label, strlen(label) },
 	};
 
@@ -3532,13 +3532,13 @@ static void xtest_pkcs11_test_1014(ADBG_Case_t *c)
 	CK_ATTRIBUTE get_template[] = {
 		{ CKA_LABEL, (CK_UTF8CHAR_PTR)g_label, sizeof(g_label) },
 		{ CKA_ID, (CK_BYTE_PTR)g_id, sizeof(g_id) },
-		{ CKA_DERIVE, &g_derive, sizeof(CK_BBOOL) },
-		{ CKA_SIGN, &g_sign, sizeof(CK_BBOOL) },
-		{ CKA_VERIFY, &g_verify, sizeof(CK_BBOOL) },
-		{ CKA_ENCRYPT, &g_encrypt, sizeof(CK_BBOOL) },
-		{ CKA_DECRYPT, &g_decrypt, sizeof(CK_BBOOL) },
-		{ CKA_WRAP, &g_wrap, sizeof(CK_BBOOL) },
-		{ CKA_UNWRAP, &g_unwrap, sizeof(CK_BBOOL) },
+		{ CKA_DERIVE, &g_derive, sizeof(g_derive) },
+		{ CKA_SIGN, &g_sign, sizeof(g_sign) },
+		{ CKA_VERIFY, &g_verify, sizeof(g_verify) },
+		{ CKA_ENCRYPT, &g_encrypt, sizeof(g_encrypt) },
+		{ CKA_DECRYPT, &g_decrypt, sizeof(g_decrypt) },
+		{ CKA_WRAP, &g_wrap, sizeof(g_wrap) },
+		{ CKA_UNWRAP, &g_unwrap, sizeof(g_unwrap) },
 		{ CKA_VALUE_LEN, &g_len, sizeof(g_len) },
 	};
 	CK_ATTRIBUTE set_template[] = {
@@ -3750,16 +3750,16 @@ static void xtest_pkcs11_test_1015(ADBG_Case_t *c)
 	CK_BBOOL g_local =  CK_FALSE;
 	CK_BYTE g_value[16] = { };
 	CK_ATTRIBUTE get_template[] = {
-		{ CKA_TOKEN, &g_token, sizeof(CK_BBOOL) },
-		{ CKA_PRIVATE, &g_private, sizeof(CK_BBOOL) },
-		{ CKA_MODIFIABLE, &g_modify, sizeof(CK_BBOOL) },
-		{ CKA_COPYABLE, &g_copy, sizeof(CK_BBOOL) },
-		{ CKA_DESTROYABLE, &g_destroy, sizeof(CK_BBOOL) },
-		{ CKA_EXTRACTABLE, &g_extract, sizeof(CK_BBOOL) },
-		{ CKA_SENSITIVE, &g_sensitive, sizeof(CK_BBOOL) },
-		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(CK_BBOOL) },
-		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(CK_BBOOL) },
-		{ CKA_LOCAL, &g_local, sizeof(CK_BBOOL) },
+		{ CKA_TOKEN, &g_token, sizeof(g_token) },
+		{ CKA_PRIVATE, &g_private, sizeof(g_private) },
+		{ CKA_MODIFIABLE, &g_modify, sizeof(g_modify) },
+		{ CKA_COPYABLE, &g_copy, sizeof(g_copy) },
+		{ CKA_DESTROYABLE, &g_destroy, sizeof(g_destroy) },
+		{ CKA_EXTRACTABLE, &g_extract, sizeof(g_extract) },
+		{ CKA_SENSITIVE, &g_sensitive, sizeof(g_sensitive) },
+		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(g_nextract) },
+		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(g_asensitive) },
+		{ CKA_LOCAL, &g_local, sizeof(g_local) },
 	};
 	CK_ATTRIBUTE get_value_template[] = {
 		{ CKA_VALUE, &g_value, sizeof(g_value) }
@@ -4241,13 +4241,13 @@ static void xtest_pkcs11_test_1017(ADBG_Case_t *c)
 	uint8_t g_val[516] = { 0 };
 	CK_ULONG secret_len = 0;
 	CK_ATTRIBUTE get_template[] = {
-		{ CKA_CLASS, &g_class, sizeof(CK_OBJECT_CLASS) },
-		{ CKA_KEY_TYPE,	&g_key_type, sizeof(CK_KEY_TYPE) },
-		{ CKA_EXTRACTABLE, &g_extract, sizeof(CK_BBOOL) },
-		{ CKA_SENSITIVE, &g_sensitive, sizeof(CK_BBOOL) },
-		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(CK_BBOOL) },
-		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(CK_BBOOL) },
-		{ CKA_LOCAL, &g_local, sizeof(CK_BBOOL) },
+		{ CKA_CLASS, &g_class, sizeof(g_class) },
+		{ CKA_KEY_TYPE,	&g_key_type, sizeof(g_key_type) },
+		{ CKA_EXTRACTABLE, &g_extract, sizeof(g_extract) },
+		{ CKA_SENSITIVE, &g_sensitive, sizeof(g_sensitive) },
+		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(g_nextract) },
+		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(g_asensitive) },
+		{ CKA_LOCAL, &g_local, sizeof(g_local) },
 		{ CKA_VALUE_LEN, &secret_len, sizeof(secret_len) },
 		/*
 		 * CKA_VALUE should remain last attribute in template,
@@ -5520,43 +5520,43 @@ static int test_ec_operations(ADBG_Case_t *c, CK_SESSION_HANDLE session,
 	CK_BBOOL g_always_authenticate = CK_FALSE;
 
 	CK_ATTRIBUTE get_public_template[] = {
-		{ CKA_CLASS, &g_class, sizeof(CK_OBJECT_CLASS) },
-		{ CKA_KEY_TYPE,	&g_key_type, sizeof(CK_KEY_TYPE) },
+		{ CKA_CLASS, &g_class, sizeof(g_class) },
+		{ CKA_KEY_TYPE,	&g_key_type, sizeof(g_key_type) },
 		{ CKA_ID, g_id, sizeof(g_id) },
-		{ CKA_START_DATE, &g_start_date, sizeof(CK_DATE) },
-		{ CKA_END_DATE, &g_end_date, sizeof(CK_DATE) },
-		{ CKA_DERIVE, &g_derive, sizeof(CK_BBOOL) },
-		{ CKA_LOCAL, &g_local, sizeof(CK_BBOOL) },
-		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(CK_MECHANISM_TYPE) },
+		{ CKA_START_DATE, &g_start_date, sizeof(g_start_date) },
+		{ CKA_END_DATE, &g_end_date, sizeof(g_end_date) },
+		{ CKA_DERIVE, &g_derive, sizeof(g_derive) },
+		{ CKA_LOCAL, &g_local, sizeof(g_local) },
+		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(g_keygen_mecha) },
 		{ CKA_SUBJECT, g_subject, sizeof(g_subject) },
-		{ CKA_ENCRYPT, &g_encrypt, sizeof(CK_BBOOL) },
-		{ CKA_VERIFY, &g_verify, sizeof(CK_BBOOL) },
-		{ CKA_VERIFY_RECOVER, &g_verify_recover, sizeof(CK_BBOOL) },
-		{ CKA_WRAP, &g_wrap, sizeof(CK_BBOOL) },
-		{ CKA_TRUSTED, &g_trusted, sizeof(CK_BBOOL) },
+		{ CKA_ENCRYPT, &g_encrypt, sizeof(g_encrypt) },
+		{ CKA_VERIFY, &g_verify, sizeof(g_verify) },
+		{ CKA_VERIFY_RECOVER, &g_verify_recover, sizeof(g_verify_recover) },
+		{ CKA_WRAP, &g_wrap, sizeof(g_wrap) },
+		{ CKA_TRUSTED, &g_trusted, sizeof(g_trusted) },
 		{ CKA_PUBLIC_KEY_INFO, g_public_key_info, sizeof(g_public_key_info) },
 	};
 
 	CK_ATTRIBUTE get_private_template[] = {
-		{ CKA_CLASS, &g_class, sizeof(CK_OBJECT_CLASS) },
-		{ CKA_KEY_TYPE,	&g_key_type, sizeof(CK_KEY_TYPE) },
+		{ CKA_CLASS, &g_class, sizeof(g_class) },
+		{ CKA_KEY_TYPE,	&g_key_type, sizeof(g_key_type) },
 		{ CKA_ID, g_id, sizeof(g_id) },
-		{ CKA_START_DATE, &g_start_date, sizeof(CK_DATE) },
-		{ CKA_END_DATE, &g_end_date, sizeof(CK_DATE) },
-		{ CKA_DERIVE, &g_derive, sizeof(CK_BBOOL) },
-		{ CKA_LOCAL, &g_local, sizeof(CK_BBOOL) },
-		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(CK_MECHANISM_TYPE) },
+		{ CKA_START_DATE, &g_start_date, sizeof(g_start_date) },
+		{ CKA_END_DATE, &g_end_date, sizeof(g_end_date) },
+		{ CKA_DERIVE, &g_derive, sizeof(g_derive) },
+		{ CKA_LOCAL, &g_local, sizeof(g_local) },
+		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(g_keygen_mecha) },
 		{ CKA_SUBJECT, g_subject, sizeof(g_subject) },
-		{ CKA_SENSITIVE, &g_sensitive, sizeof(CK_BBOOL) },
-		{ CKA_DECRYPT, &g_decrypt, sizeof(CK_BBOOL) },
-		{ CKA_SIGN, &g_sign, sizeof(CK_BBOOL) },
-		{ CKA_SIGN_RECOVER, &g_sign_recover, sizeof(CK_BBOOL) },
-		{ CKA_UNWRAP, &g_unwrap, sizeof(CK_BBOOL) },
-		{ CKA_EXTRACTABLE, &g_extract, sizeof(CK_BBOOL) },
-		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(CK_BBOOL) },
-		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(CK_BBOOL) },
-		{ CKA_WRAP_WITH_TRUSTED, &g_wrap_with_trusted, sizeof(CK_BBOOL) },
-		{ CKA_ALWAYS_AUTHENTICATE, &g_always_authenticate, sizeof(CK_BBOOL) },
+		{ CKA_SENSITIVE, &g_sensitive, sizeof(g_sensitive) },
+		{ CKA_DECRYPT, &g_decrypt, sizeof(g_decrypt) },
+		{ CKA_SIGN, &g_sign, sizeof(g_sign) },
+		{ CKA_SIGN_RECOVER, &g_sign_recover, sizeof(g_sign_recover) },
+		{ CKA_UNWRAP, &g_unwrap, sizeof(g_unwrap) },
+		{ CKA_EXTRACTABLE, &g_extract, sizeof(g_extract) },
+		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(g_asensitive) },
+		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(g_nextract) },
+		{ CKA_WRAP_WITH_TRUSTED, &g_wrap_with_trusted, sizeof(g_wrap_with_trusted) },
+		{ CKA_ALWAYS_AUTHENTICATE, &g_always_authenticate, sizeof(g_always_authenticate) },
 		{ CKA_PUBLIC_KEY_INFO, g_public_key_info, sizeof(g_public_key_info) },
 	};
 
@@ -5903,17 +5903,16 @@ static void xtest_pkcs11_test_1020(ADBG_Case_t *c)
 	CK_ULONG unwrapped_key_len = 0;
 	/* Keep last attribute as CKA_VALUE */
 	CK_ATTRIBUTE get_template_unwrapped[] = {
-		{ CKA_CLASS, &g_class, sizeof(CK_OBJECT_CLASS) },
-		{ CKA_KEY_TYPE,	&g_key_type, sizeof(CK_KEY_TYPE) },
-		{ CKA_EXTRACTABLE, &g_extract, sizeof(CK_BBOOL) },
-		{ CKA_SENSITIVE, &g_sensitive, sizeof(CK_BBOOL) },
-		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(CK_BBOOL) },
-		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(CK_BBOOL) },
-		{ CKA_LOCAL, &g_local, sizeof(CK_BBOOL) },
-		{ CKA_TOKEN, &g_token, sizeof(CK_BBOOL) },
-		{ CKA_DERIVE, &g_derive, sizeof(CK_BBOOL) },
-		{ CKA_VALUE_LEN, &unwrapped_key_len,
-		  sizeof(unwrapped_key_len) },
+		{ CKA_CLASS, &g_class, sizeof(g_class) },
+		{ CKA_KEY_TYPE,	&g_key_type, sizeof(g_key_type) },
+		{ CKA_EXTRACTABLE, &g_extract, sizeof(g_extract) },
+		{ CKA_SENSITIVE, &g_sensitive, sizeof(g_sensitive) },
+		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(g_nextract) },
+		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(g_asensitive) },
+		{ CKA_LOCAL, &g_local, sizeof(g_local) },
+		{ CKA_TOKEN, &g_token, sizeof(g_token) },
+		{ CKA_DERIVE, &g_derive, sizeof(g_derive) },
+		{ CKA_VALUE_LEN, &unwrapped_key_len, sizeof(unwrapped_key_len) },
 		{ CKA_VALUE, g_unwrapped_val, sizeof(g_unwrapped_val) },
 	};
 	CK_ATTRIBUTE get_template[] = {
@@ -6506,44 +6505,44 @@ static int test_rsa_pkcs_operations(ADBG_Case_t *c,
 
 	/* Note: Tests below expects specific order of elements */
 	CK_ATTRIBUTE get_public_template[] = {
-		{ CKA_CLASS, &g_class, sizeof(CK_OBJECT_CLASS) },
-		{ CKA_KEY_TYPE,	&g_key_type, sizeof(CK_KEY_TYPE) },
+		{ CKA_CLASS, &g_class, sizeof(g_class) },
+		{ CKA_KEY_TYPE,	&g_key_type, sizeof(g_key_type) },
 		{ CKA_ID, g_id, sizeof(g_id) },
-		{ CKA_START_DATE, &g_start_date, sizeof(CK_DATE) },
-		{ CKA_END_DATE, &g_end_date, sizeof(CK_DATE) },
-		{ CKA_DERIVE, &g_derive, sizeof(CK_BBOOL) },
-		{ CKA_LOCAL, &g_local, sizeof(CK_BBOOL) },
-		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(CK_MECHANISM_TYPE) },
+		{ CKA_START_DATE, &g_start_date, sizeof(g_start_date) },
+		{ CKA_END_DATE, &g_end_date, sizeof(g_end_date) },
+		{ CKA_DERIVE, &g_derive, sizeof(g_derive) },
+		{ CKA_LOCAL, &g_local, sizeof(g_local) },
+		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(g_keygen_mecha) },
 		{ CKA_SUBJECT, g_subject, sizeof(g_subject) },
-		{ CKA_ENCRYPT, &g_encrypt, sizeof(CK_BBOOL) },
-		{ CKA_VERIFY, &g_verify, sizeof(CK_BBOOL) },
-		{ CKA_VERIFY_RECOVER, &g_verify_recover, sizeof(CK_BBOOL) },
-		{ CKA_WRAP, &g_wrap, sizeof(CK_BBOOL) },
-		{ CKA_TRUSTED, &g_trusted, sizeof(CK_BBOOL) },
+		{ CKA_ENCRYPT, &g_encrypt, sizeof(g_encrypt) },
+		{ CKA_VERIFY, &g_verify, sizeof(g_verify) },
+		{ CKA_VERIFY_RECOVER, &g_verify_recover, sizeof(g_verify_recover) },
+		{ CKA_WRAP, &g_wrap, sizeof(g_wrap) },
+		{ CKA_TRUSTED, &g_trusted, sizeof(g_trusted) },
 		{ CKA_PUBLIC_KEY_INFO, g_public_key_info, sizeof(g_public_key_info) },
 	};
 
 	/* Note: Tests below expects specific order of elements */
 	CK_ATTRIBUTE get_private_template[] = {
-		{ CKA_CLASS, &g_class, sizeof(CK_OBJECT_CLASS) },
-		{ CKA_KEY_TYPE,	&g_key_type, sizeof(CK_KEY_TYPE) },
+		{ CKA_CLASS, &g_class, sizeof(g_class) },
+		{ CKA_KEY_TYPE,	&g_key_type, sizeof(g_key_type) },
 		{ CKA_ID, g_id, sizeof(g_id) },
-		{ CKA_START_DATE, &g_start_date, sizeof(CK_DATE) },
-		{ CKA_END_DATE, &g_end_date, sizeof(CK_DATE) },
-		{ CKA_DERIVE, &g_derive, sizeof(CK_BBOOL) },
-		{ CKA_LOCAL, &g_local, sizeof(CK_BBOOL) },
-		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(CK_MECHANISM_TYPE) },
+		{ CKA_START_DATE, &g_start_date, sizeof(g_start_date) },
+		{ CKA_END_DATE, &g_end_date, sizeof(g_end_date) },
+		{ CKA_DERIVE, &g_derive, sizeof(g_derive) },
+		{ CKA_LOCAL, &g_local, sizeof(g_local) },
+		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(g_keygen_mecha) },
 		{ CKA_SUBJECT, g_subject, sizeof(g_subject) },
-		{ CKA_SENSITIVE, &g_sensitive, sizeof(CK_BBOOL) },
-		{ CKA_DECRYPT, &g_decrypt, sizeof(CK_BBOOL) },
-		{ CKA_SIGN, &g_sign, sizeof(CK_BBOOL) },
-		{ CKA_SIGN_RECOVER, &g_sign_recover, sizeof(CK_BBOOL) },
-		{ CKA_UNWRAP, &g_unwrap, sizeof(CK_BBOOL) },
-		{ CKA_EXTRACTABLE, &g_extract, sizeof(CK_BBOOL) },
-		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(CK_BBOOL) },
-		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(CK_BBOOL) },
-		{ CKA_WRAP_WITH_TRUSTED, &g_wrap_with_trusted, sizeof(CK_BBOOL) },
-		{ CKA_ALWAYS_AUTHENTICATE, &g_always_authenticate, sizeof(CK_BBOOL) },
+		{ CKA_SENSITIVE, &g_sensitive, sizeof(g_sensitive) },
+		{ CKA_DECRYPT, &g_decrypt, sizeof(g_decrypt) },
+		{ CKA_SIGN, &g_sign, sizeof(g_sign) },
+		{ CKA_SIGN_RECOVER, &g_sign_recover, sizeof(g_sign_recover) },
+		{ CKA_UNWRAP, &g_unwrap, sizeof(g_unwrap) },
+		{ CKA_EXTRACTABLE, &g_extract, sizeof(g_extract) },
+		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(g_asensitive) },
+		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(g_nextract) },
+		{ CKA_WRAP_WITH_TRUSTED, &g_wrap_with_trusted, sizeof(g_wrap_with_trusted) },
+		{ CKA_ALWAYS_AUTHENTICATE, &g_always_authenticate, sizeof(g_always_authenticate) },
 		{ CKA_PUBLIC_KEY_INFO, g_public_key_info, sizeof(g_public_key_info) },
 	};
 
@@ -6862,7 +6861,7 @@ static int test_rsa_pss_operations(ADBG_Case_t *c,
 		{ CKA_ENCRYPT, &(CK_BBOOL){ CK_FALSE }, sizeof(CK_BBOOL) },
 		{ CKA_VERIFY, &(CK_BBOOL){ CK_TRUE }, sizeof(CK_BBOOL) },
 		{ CKA_WRAP, &(CK_BBOOL){ CK_FALSE }, sizeof(CK_BBOOL) },
-		{ CKA_MODULUS_BITS, &modulus_bits, sizeof(CK_ULONG) },
+		{ CKA_MODULUS_BITS, &modulus_bits, sizeof(modulus_bits) },
 		{ CKA_PUBLIC_EXPONENT, public_exponent,
 		  sizeof(public_exponent) }
 	};
@@ -6907,44 +6906,44 @@ static int test_rsa_pss_operations(ADBG_Case_t *c,
 
 	/* Note: Tests below expects specific order of elements */
 	CK_ATTRIBUTE get_public_template[] = {
-		{ CKA_CLASS, &g_class, sizeof(CK_OBJECT_CLASS) },
-		{ CKA_KEY_TYPE,	&g_key_type, sizeof(CK_KEY_TYPE) },
+		{ CKA_CLASS, &g_class, sizeof(g_class) },
+		{ CKA_KEY_TYPE,	&g_key_type, sizeof(g_key_type) },
 		{ CKA_ID, g_id, sizeof(g_id) },
-		{ CKA_START_DATE, &g_start_date, sizeof(CK_DATE) },
-		{ CKA_END_DATE, &g_end_date, sizeof(CK_DATE) },
-		{ CKA_DERIVE, &g_derive, sizeof(CK_BBOOL) },
-		{ CKA_LOCAL, &g_local, sizeof(CK_BBOOL) },
-		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(CK_MECHANISM_TYPE) },
+		{ CKA_START_DATE, &g_start_date, sizeof(g_start_date) },
+		{ CKA_END_DATE, &g_end_date, sizeof(g_end_date) },
+		{ CKA_DERIVE, &g_derive, sizeof(g_derive) },
+		{ CKA_LOCAL, &g_local, sizeof(g_local) },
+		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(g_keygen_mecha) },
 		{ CKA_SUBJECT, g_subject, sizeof(g_subject) },
-		{ CKA_ENCRYPT, &g_encrypt, sizeof(CK_BBOOL) },
-		{ CKA_VERIFY, &g_verify, sizeof(CK_BBOOL) },
-		{ CKA_VERIFY_RECOVER, &g_verify_recover, sizeof(CK_BBOOL) },
-		{ CKA_WRAP, &g_wrap, sizeof(CK_BBOOL) },
-		{ CKA_TRUSTED, &g_trusted, sizeof(CK_BBOOL) },
+		{ CKA_ENCRYPT, &g_encrypt, sizeof(g_encrypt) },
+		{ CKA_VERIFY, &g_verify, sizeof(g_verify) },
+		{ CKA_VERIFY_RECOVER, &g_verify_recover, sizeof(g_verify_recover) },
+		{ CKA_WRAP, &g_wrap, sizeof(g_wrap) },
+		{ CKA_TRUSTED, &g_trusted, sizeof(g_trusted) },
 		{ CKA_PUBLIC_KEY_INFO, g_public_key_info, sizeof(g_public_key_info) },
 	};
 
 	/* Note: Tests below expects specific order of elements */
 	CK_ATTRIBUTE get_private_template[] = {
-		{ CKA_CLASS, &g_class, sizeof(CK_OBJECT_CLASS) },
-		{ CKA_KEY_TYPE,	&g_key_type, sizeof(CK_KEY_TYPE) },
+		{ CKA_CLASS, &g_class, sizeof(g_class) },
+		{ CKA_KEY_TYPE,	&g_key_type, sizeof(g_key_type) },
 		{ CKA_ID, g_id, sizeof(g_id) },
-		{ CKA_START_DATE, &g_start_date, sizeof(CK_DATE) },
-		{ CKA_END_DATE, &g_end_date, sizeof(CK_DATE) },
-		{ CKA_DERIVE, &g_derive, sizeof(CK_BBOOL) },
-		{ CKA_LOCAL, &g_local, sizeof(CK_BBOOL) },
-		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(CK_MECHANISM_TYPE) },
+		{ CKA_START_DATE, &g_start_date, sizeof(g_start_date) },
+		{ CKA_END_DATE, &g_end_date, sizeof(g_end_date) },
+		{ CKA_DERIVE, &g_derive, sizeof(g_derive) },
+		{ CKA_LOCAL, &g_local, sizeof(g_local) },
+		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(g_keygen_mecha) },
 		{ CKA_SUBJECT, g_subject, sizeof(g_subject) },
-		{ CKA_SENSITIVE, &g_sensitive, sizeof(CK_BBOOL) },
-		{ CKA_DECRYPT, &g_decrypt, sizeof(CK_BBOOL) },
-		{ CKA_SIGN, &g_sign, sizeof(CK_BBOOL) },
-		{ CKA_SIGN_RECOVER, &g_sign_recover, sizeof(CK_BBOOL) },
-		{ CKA_UNWRAP, &g_unwrap, sizeof(CK_BBOOL) },
-		{ CKA_EXTRACTABLE, &g_extract, sizeof(CK_BBOOL) },
-		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(CK_BBOOL) },
-		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(CK_BBOOL) },
-		{ CKA_WRAP_WITH_TRUSTED, &g_wrap_with_trusted, sizeof(CK_BBOOL) },
-		{ CKA_ALWAYS_AUTHENTICATE, &g_always_authenticate, sizeof(CK_BBOOL) },
+		{ CKA_SENSITIVE, &g_sensitive, sizeof(g_sensitive) },
+		{ CKA_DECRYPT, &g_decrypt, sizeof(g_decrypt) },
+		{ CKA_SIGN, &g_sign, sizeof(g_sign) },
+		{ CKA_SIGN_RECOVER, &g_sign_recover, sizeof(g_sign_recover) },
+		{ CKA_UNWRAP, &g_unwrap, sizeof(g_unwrap) },
+		{ CKA_EXTRACTABLE, &g_extract, sizeof(g_extract) },
+		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(g_asensitive) },
+		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(g_nextract) },
+		{ CKA_WRAP_WITH_TRUSTED, &g_wrap_with_trusted, sizeof(g_wrap_with_trusted) },
+		{ CKA_ALWAYS_AUTHENTICATE, &g_always_authenticate, sizeof(g_always_authenticate) },
 		{ CKA_PUBLIC_KEY_INFO, g_public_key_info, sizeof(g_public_key_info) },
 	};
 
@@ -7226,7 +7225,7 @@ static int test_rsa_oaep_operations(ADBG_Case_t *c,
 		{ CKA_ENCRYPT, &(CK_BBOOL){ CK_TRUE }, sizeof(CK_BBOOL) },
 		{ CKA_VERIFY, &(CK_BBOOL){ CK_TRUE }, sizeof(CK_BBOOL) },
 		{ CKA_WRAP, &(CK_BBOOL){ CK_FALSE }, sizeof(CK_BBOOL) },
-		{ CKA_MODULUS_BITS, &modulus_bits, sizeof(CK_ULONG) },
+		{ CKA_MODULUS_BITS, &modulus_bits, sizeof(modulus_bits) },
 		{ CKA_PUBLIC_EXPONENT, public_exponent,
 		  sizeof(public_exponent) }
 	};
@@ -7270,44 +7269,44 @@ static int test_rsa_oaep_operations(ADBG_Case_t *c,
 
 	/* Note: Tests below expects specific order of elements */
 	CK_ATTRIBUTE get_public_template[] = {
-		{ CKA_CLASS, &g_class, sizeof(CK_OBJECT_CLASS) },
-		{ CKA_KEY_TYPE,	&g_key_type, sizeof(CK_KEY_TYPE) },
+		{ CKA_CLASS, &g_class, sizeof(g_class) },
+		{ CKA_KEY_TYPE,	&g_key_type, sizeof(g_key_type) },
 		{ CKA_ID, g_id, sizeof(g_id) },
-		{ CKA_START_DATE, &g_start_date, sizeof(CK_DATE) },
-		{ CKA_END_DATE, &g_end_date, sizeof(CK_DATE) },
-		{ CKA_DERIVE, &g_derive, sizeof(CK_BBOOL) },
-		{ CKA_LOCAL, &g_local, sizeof(CK_BBOOL) },
-		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(CK_MECHANISM_TYPE) },
+		{ CKA_START_DATE, &g_start_date, sizeof(g_start_date) },
+		{ CKA_END_DATE, &g_end_date, sizeof(g_end_date) },
+		{ CKA_DERIVE, &g_derive, sizeof(g_derive) },
+		{ CKA_LOCAL, &g_local, sizeof(g_local) },
+		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(g_keygen_mecha) },
 		{ CKA_SUBJECT, g_subject, sizeof(g_subject) },
-		{ CKA_ENCRYPT, &g_encrypt, sizeof(CK_BBOOL) },
-		{ CKA_VERIFY, &g_verify, sizeof(CK_BBOOL) },
-		{ CKA_VERIFY_RECOVER, &g_verify_recover, sizeof(CK_BBOOL) },
-		{ CKA_WRAP, &g_wrap, sizeof(CK_BBOOL) },
-		{ CKA_TRUSTED, &g_trusted, sizeof(CK_BBOOL) },
+		{ CKA_ENCRYPT, &g_encrypt, sizeof(g_encrypt) },
+		{ CKA_VERIFY, &g_verify, sizeof(g_verify) },
+		{ CKA_VERIFY_RECOVER, &g_verify_recover, sizeof(g_verify_recover) },
+		{ CKA_WRAP, &g_wrap, sizeof(g_wrap) },
+		{ CKA_TRUSTED, &g_trusted, sizeof(g_trusted) },
 		{ CKA_PUBLIC_KEY_INFO, g_public_key_info, sizeof(g_public_key_info) },
 	};
 
 	/* Note: Tests below expects specific order of elements */
 	CK_ATTRIBUTE get_private_template[] = {
-		{ CKA_CLASS, &g_class, sizeof(CK_OBJECT_CLASS) },
-		{ CKA_KEY_TYPE,	&g_key_type, sizeof(CK_KEY_TYPE) },
+		{ CKA_CLASS, &g_class, sizeof(g_class) },
+		{ CKA_KEY_TYPE,	&g_key_type, sizeof(g_key_type) },
 		{ CKA_ID, g_id, sizeof(g_id) },
-		{ CKA_START_DATE, &g_start_date, sizeof(CK_DATE) },
-		{ CKA_END_DATE, &g_end_date, sizeof(CK_DATE) },
-		{ CKA_DERIVE, &g_derive, sizeof(CK_BBOOL) },
-		{ CKA_LOCAL, &g_local, sizeof(CK_BBOOL) },
-		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(CK_MECHANISM_TYPE) },
+		{ CKA_START_DATE, &g_start_date, sizeof(g_start_date) },
+		{ CKA_END_DATE, &g_end_date, sizeof(g_end_date) },
+		{ CKA_DERIVE, &g_derive, sizeof(g_derive) },
+		{ CKA_LOCAL, &g_local, sizeof(g_local) },
+		{ CKA_KEY_GEN_MECHANISM, &g_keygen_mecha, sizeof(g_keygen_mecha) },
 		{ CKA_SUBJECT, g_subject, sizeof(g_subject) },
-		{ CKA_SENSITIVE, &g_sensitive, sizeof(CK_BBOOL) },
-		{ CKA_DECRYPT, &g_decrypt, sizeof(CK_BBOOL) },
-		{ CKA_SIGN, &g_sign, sizeof(CK_BBOOL) },
-		{ CKA_SIGN_RECOVER, &g_sign_recover, sizeof(CK_BBOOL) },
-		{ CKA_UNWRAP, &g_unwrap, sizeof(CK_BBOOL) },
-		{ CKA_EXTRACTABLE, &g_extract, sizeof(CK_BBOOL) },
-		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(CK_BBOOL) },
-		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(CK_BBOOL) },
-		{ CKA_WRAP_WITH_TRUSTED, &g_wrap_with_trusted, sizeof(CK_BBOOL) },
-		{ CKA_ALWAYS_AUTHENTICATE, &g_always_authenticate, sizeof(CK_BBOOL) },
+		{ CKA_SENSITIVE, &g_sensitive, sizeof(g_sensitive) },
+		{ CKA_DECRYPT, &g_decrypt, sizeof(g_decrypt) },
+		{ CKA_SIGN, &g_sign, sizeof(g_sign) },
+		{ CKA_SIGN_RECOVER, &g_sign_recover, sizeof(g_sign_recover) },
+		{ CKA_UNWRAP, &g_unwrap, sizeof(g_unwrap) },
+		{ CKA_EXTRACTABLE, &g_extract, sizeof(g_extract) },
+		{ CKA_ALWAYS_SENSITIVE, &g_asensitive, sizeof(g_asensitive) },
+		{ CKA_NEVER_EXTRACTABLE, &g_nextract, sizeof(g_nextract) },
+		{ CKA_WRAP_WITH_TRUSTED, &g_wrap_with_trusted, sizeof(g_wrap_with_trusted) },
+		{ CKA_ALWAYS_AUTHENTICATE, &g_always_authenticate, sizeof(g_always_authenticate) },
 		{ CKA_PUBLIC_KEY_INFO, g_public_key_info, sizeof(g_public_key_info) },
 	};
 	uint8_t ciphertext[512] = { 0 };