Fix incompatible pointers arguments

The wrapped_obj_len variable on 32b architecture is of a different size than expected by the PKCS Yubico#11 API, causing build failures. In file included from /builddir/build/BUILD/yubihsm-shell-2.6.0-build/yubihsm-shell-2.6.0/pkcs11/tests/asym_wrap_test.c:20: /builddir/build/BUILD/yubihsm-shell-2.6.0-build/yubihsm-shell-2.6.0/pkcs11/tests/asym_wrap_test.c: In function ‘get_wrapped_data’: /builddir/build/BUILD/yubihsm-shell-2.6.0-build/yubihsm-shell-2.6.0/pkcs11/tests/asym_wrap_test.c:344:25: error: passing argument 6 of ‘p11->C_WrapKey’ from incompatible pointer type [-Wincompatible-pointer-types] 344 | wrapped_obj_len) == CKR_OK); | ^~~~~~~~~~~~~~~ | | | size_t * {aka unsigned int *} /builddir/build/BUILD/yubihsm-shell-2.6.0-build/yubihsm-shell-2.6.0/pkcs11/tests/asym_wrap_test.c:344:25: note: expected ‘CK_ULONG_PTR’ {aka ‘long unsigned int *’} but argument is of type ‘size_t *’ {aka ‘unsigned int *’} /builddir/build/BUILD/yubihsm-shell-2.6.0-build/yubihsm-shell-2.6.0/pkcs11/tests/asym_wrap_test.c:344:25: error: passing argument 6 of ‘p11->C_WrapKey’ from incompatible pointer type [-Wincompatible-pointer-types] 344 | wrapped_obj_len) == CKR_OK); | ^~~~~~~~~~~~~~~ | | | size_t * {aka unsigned int *} /builddir/build/BUILD/yubihsm-shell-2.6.0-build/yubihsm-shell-2.6.0/pkcs11/tests/asym_wrap_test.c:344:25: note: expected ‘CK_ULONG_PTR’ {aka ‘long unsigned int *’} but argument is of type ‘size_t *’ {aka ‘unsigned int *’} Signed-off-by: Jakub Jelen <[email protected]>
Jakuje · Sep 11, 2024 · ea8431a · ea8431a
1 parent 88fc81f
commit ea8431a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkcs11/tests/asym_wrap_test.c b/pkcs11/tests/asym_wrap_test.c
@@ -334,14 +334,16 @@ static void get_wrapped_data(CK_OBJECT_HANDLE wrapping_keyid,
   CK_RSA_PKCS_OAEP_PARAMS oaep_params = {CKM_SHA256, CKG_MGF1_SHA256, 0, NULL, 0};
   CK_RSA_AES_KEY_WRAP_PARAMS params = {256, &oaep_params};
   CK_MECHANISM mech = {0, &params, sizeof(params)};
+  CK_ULONG wrapped_len = *wrapped_obj_len;
 
   if (only_key) {
     mech.mechanism = CKM_RSA_AES_KEY_WRAP;
   } else {
     mech.mechanism = CKM_YUBICO_RSA_WRAP;
   }
   assert(p11->C_WrapKey(session, &mech, wrapping_keyid, keyid, wrapped_obj,
-                        wrapped_obj_len) == CKR_OK);
+                        &wrapped_len) == CKR_OK);
+  *wrapped_obj_len = wrapped_len;
 }
 
 static CK_OBJECT_HANDLE import_wrapped_data(CK_OBJECT_HANDLE wrapping_keyid,