Skip to content

Commit

Permalink
Merge pull request #28 from bigbrett/suppress-compiler-warn
Browse files Browse the repository at this point in the history 
compiler warning fixes for 32-bit platforms
  • Loading branch information
@billphipps
billphipps authored May 9, 2024
2 parents b5dc6b2 + 6e64699 commit 62ff7cb
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 54 deletions.
8 changes: 4 additions & 4 deletions src/wh_server_crypto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ static int hsmLoadKeyRsa(whServerContext* server, RsaKey* key, whKeyId keyId)
/* decode the key */
if (ret >= 0) {
size = WOLFHSM_KEYCACHE_BUFSIZE;
ret = wc_RsaPrivateKeyDecode(server->cache[slotIdx].buffer, &idx, key,
ret = wc_RsaPrivateKeyDecode(server->cache[slotIdx].buffer, (word32*)&idx, key,
size);
}
return ret;
Expand Down Expand Up @@ -151,7 +151,7 @@ int wh_Server_HandleCryptoRequest(whServerContext* server,
int ret = 0;
uint32_t field;
uint8_t* in;
whKeyId keyId;
whKeyId keyId = WOLFHSM_KEYID_ERASED;
uint8_t* out;
whPacket* packet = (whPacket*)data;
#ifdef WOLFHSM_SYMMETRIC_INTERNAL
Expand Down Expand Up @@ -216,7 +216,7 @@ int wh_Server_HandleCryptoRequest(whServerContext* server,
if (ret == 0) {
field = packet->pkRsaReq.outLen;
ret = wc_RsaFunction( in, packet->pkRsaReq.inLen,
out, &field, packet->pkRsaReq.opType,
out, (word32*)&field, packet->pkRsaReq.opType,
server->crypto->rsa, server->crypto->rng);
}
/* free the key */
Expand Down Expand Up @@ -311,7 +311,7 @@ int wh_Server_HandleCryptoRequest(whServerContext* server,
field = CURVE25519_KEYSIZE;
ret = wc_curve25519_shared_secret_ex(
server->crypto->curve25519Private,
server->crypto->curve25519Public, out, &field,
server->crypto->curve25519Public, out, (word32*)&field,
packet->pkCurve25519Req.endian);
}
wc_curve25519_free(server->crypto->curve25519Private);
Expand Down
76 changes: 38 additions & 38 deletions test/wh_test_clientserver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ int whTest_ClientServerSequential(void)

#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmInitResponse:%d, server_rc:%d, clientid:%d serverid:%d\n",
ret, server_rc, client_id, server_id);
ret, (int)server_rc, (int)client_id, (int)server_id);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);

Expand All @@ -622,8 +622,8 @@ int whTest_ClientServerSequential(void)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmGetAvailableResponse:%d, server_rc:%d avail_size:%d "
"avail_objects:%d, reclaim_size:%d reclaim_objects:%d\n",
ret, server_rc, avail_size, avail_objects, reclaim_size,
reclaim_objects);
ret, (int)server_rc, (int)avail_size, (int)avail_objects, (int)reclaim_size,
(int)reclaim_objects);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
WH_TEST_ASSERT_RETURN(avail_objects == NF_OBJECT_COUNT);
Expand Down Expand Up @@ -666,7 +666,7 @@ int whTest_ClientServerSequential(void)
wh_Client_NvmAddObjectResponse(client, &server_rc));
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmAddObjectResponse:%d, server_rc:%d\n", ret,
server_rc);
(int)server_rc);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);

Expand All @@ -678,8 +678,8 @@ int whTest_ClientServerSequential(void)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmGetAvailableResponse:%d, server_rc:%d, avail_size:%d "
"avail_objects:%d, reclaim_size:%d reclaim_objects:%d\n",
ret, server_rc, avail_size, avail_objects, reclaim_size,
reclaim_objects);
ret, (int)server_rc, (int)avail_size, (int)avail_objects, (int)reclaim_size,
(int)reclaim_objects);
#endif

/* Check that available objects decreased by one */
Expand Down Expand Up @@ -709,7 +709,7 @@ int whTest_ClientServerSequential(void)
#if defined(WH_CFG_TEST_VERBOSE)
printf(
"Client NvmReadResponse:%d, server_rc:%d id:%u, len:%u data:%s\n",
ret, server_rc, gid, rlen, recv_buffer);
ret, (int)server_rc, (unsigned int)gid, (unsigned int)rlen, recv_buffer);
#endif

/* Ensure data and size of response object matches that of the written
Expand All @@ -731,7 +731,7 @@ int whTest_ClientServerSequential(void)
client, &server_rc, &list_count, &list_id));
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmListResponse:%d, server_rc:%d count:%u id:%u\n", ret,
server_rc, list_count, list_id);
(int)server_rc, (unsigned int)list_count, (unsigned int)list_id);
#endif

if (list_count > 0) {
Expand All @@ -747,7 +747,7 @@ int whTest_ClientServerSequential(void)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmDestroyObjectsResponse:%d, server_rc:%d for "
"id:%u with count:%u\n",
ret, server_rc, list_id, list_count);
ret, (int)server_rc, (unsigned int)list_id, (unsigned int)list_count);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);

Expand All @@ -761,7 +761,7 @@ int whTest_ClientServerSequential(void)

#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmListResponse:%d, server_rc:%d count:%u id:%u\n",
ret, server_rc, list_count, list_id);
ret, (int)server_rc, (unsigned int)list_count, (unsigned int)list_id);
#endif

list_id = 0;
Expand Down Expand Up @@ -814,7 +814,7 @@ int whTest_ClientServerSequential(void)
wh_Client_NvmAddObjectDmaResponse(client, &server_rc));
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmAddObjectDmaResponse:%d, server_rc:%d, meta.len:%u\n",
ret, server_rc, meta.len);
ret, (int)server_rc, (unsigned int)meta.len);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);

Expand All @@ -826,8 +826,8 @@ int whTest_ClientServerSequential(void)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmGetAvailableResponse:%d, server_rc:%d, avail_size:%d "
"avail_objects:%d, reclaim_size:%d reclaim_objects:%d\n",
ret, server_rc, avail_size, avail_objects, reclaim_size,
reclaim_objects);
ret, (int)server_rc, (int)avail_size, (int)avail_objects, (int)reclaim_size,
(int)reclaim_objects);
#endif
WH_TEST_ASSERT_RETURN(lastAvailObjects - 1 == avail_objects);

Expand Down Expand Up @@ -856,7 +856,7 @@ int whTest_ClientServerSequential(void)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmReadDmaResponse:%d, server_rc:%d id:%u, len:%u "
"data:%s\n",
ret, server_rc, gid, glen, recv_buffer);
ret, (int)server_rc, (unsigned int)gid, (unsigned int)glen, recv_buffer);
#endif

/* Ensure data and size of response object matches that of the written
Expand All @@ -874,7 +874,7 @@ int whTest_ClientServerSequential(void)
client, &server_rc, &list_count, &list_id));
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmListResponse:%d, server_rc:%d count:%u id:%u\n", ret,
server_rc, list_count, list_id);
(int)server_rc, (unsigned int)list_count, (unsigned int)list_id);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);

Expand All @@ -893,7 +893,7 @@ int whTest_ClientServerSequential(void)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmDestroyObjectsResponse:%d, server_rc:%d for "
"id:%u with count:%u\n",
ret, server_rc, list_id, list_count);
ret, (int)server_rc, (unsigned int)list_id, (unsigned int)list_count);
#endif

/* Ensure object was destroyed and no longer exists */
Expand All @@ -913,7 +913,7 @@ int whTest_ClientServerSequential(void)
WH_TEST_RETURN_ON_FAIL(wh_Server_HandleRequestMessage(server));
WH_TEST_RETURN_ON_FAIL(wh_Client_NvmCleanupResponse(client, &server_rc));
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmCleanupResponse:%d, server_rc:%d\n", ret, server_rc);
printf("Client NvmCleanupResponse:%d, server_rc:%d\n", ret, (int)server_rc);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);

Expand All @@ -925,8 +925,8 @@ int whTest_ClientServerSequential(void)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmGetAvailableResponse:%d, server_rc:%d, avail_size:%d "
"avail_objects:%d, reclaim_size:%d reclaim_objects:%d\n",
ret, server_rc, avail_size, avail_objects, reclaim_size,
reclaim_objects);
ret, (int)server_rc, (int)avail_size, (int)avail_objects, (int)reclaim_size,
(int)reclaim_objects);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
WH_TEST_ASSERT_RETURN(avail_objects == NF_OBJECT_COUNT);
Expand Down Expand Up @@ -1000,8 +1000,8 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmGetAvailable:%d, server_rc:%d avail_size:%d "
"avail_objects:%d, reclaim_size:%d reclaim_objects:%d\n",
ret, server_rc, avail_size, avail_objects, reclaim_size,
reclaim_objects);
ret, (int)server_rc, (int)avail_size, (int)avail_objects, (int)reclaim_size,
(int)reclaim_objects);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
WH_TEST_ASSERT_RETURN(avail_objects == NF_OBJECT_COUNT);
Expand Down Expand Up @@ -1036,7 +1036,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)

#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmAddObject:%d, server_rc:%d\n", ret,
server_rc);
(int)server_rc);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);

Expand All @@ -1047,8 +1047,8 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmGetAvailable:%d, server_rc:%d, avail_size:%d "
"avail_objects:%d, reclaim_size:%d reclaim_objects:%d\n",
ret, server_rc, avail_size, avail_objects, reclaim_size,
reclaim_objects);
ret, (int)server_rc, (int)avail_size, (int)avail_objects, (int)reclaim_size,
(int)reclaim_objects);
#endif

/* Check that available objects decreased by one */
Expand Down Expand Up @@ -1078,7 +1078,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
#if defined(WH_CFG_TEST_VERBOSE)
printf(
"Client NvmRead:%d, server_rc:%d id:%u, len:%u data:%s\n",
ret, server_rc, gid, rlen, recv_buffer);
ret, (int)server_rc, (unsigned int)gid, (unsigned int)rlen, recv_buffer);
#endif

/* Ensure data and size of response object matches that of the written
Expand All @@ -1098,7 +1098,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
&server_rc, &list_count, &list_id));
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmList:%d, server_rc:%d count:%u id:%u\n", ret,
server_rc, list_count, list_id);
(int)server_rc, (unsigned int)list_count, (unsigned int)list_id);
#endif

if (list_count > 0) {
Expand All @@ -1113,7 +1113,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmDestroyObjects:%d, server_rc:%d for "
"id:%u with count:%u\n",
ret, server_rc, list_id, list_count);
ret, (int)server_rc, (unsigned int)list_id, (unsigned int)list_count);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);

Expand All @@ -1123,7 +1123,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)

#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmGetMetadata:%d, server_rc:%d count:%u id:%u\n",
ret, server_rc, list_count, list_id);
ret, (int)server_rc, (unsigned int)list_count, (unsigned int)list_id);
#endif

list_id = 0;
Expand Down Expand Up @@ -1164,7 +1164,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)

#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmAddObjectDma:%d, server_rc:%d, meta.len:%u\n",
ret, server_rc, meta.len);
ret, (int)server_rc, meta.len);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);

Expand All @@ -1173,8 +1173,8 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmGetAvailable:%d, server_rc:%d, avail_size:%d "
"avail_objects:%d, reclaim_size:%d reclaim_objects:%d\n",
ret, server_rc, avail_size, avail_objects, reclaim_size,
reclaim_objects);
ret, (int)server_rc, (int)avail_size, (int)avail_objects, (int)reclaim_size,
(int)reclaim_objects);
#endif
WH_TEST_ASSERT_RETURN(lastAvailObjects - 1 == avail_objects);

Expand All @@ -1183,7 +1183,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmGetMetadata:%d, id:%u, access:0x%x, "
"flags:0x%x, len:%u label:%s\n",
ret, gid, gaccess, gflags, glen, glabel);
ret, (unsigned int)gid, (unsigned int)gaccess, (unsigned int)gflags, (unsigned int)glen, glabel);
#endif

/* Ensure metadata matches that of the object we just wrote */
Expand All @@ -1197,7 +1197,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmReadDma:%d, server_rc:%d id:%u, len:%u "
"data:%s\n",
ret, server_rc, gid, glen, recv_buffer);
ret, (int)server_rc, (unsigned int)gid, (unsigned int)glen, recv_buffer);
#endif

/* Ensure data and size of response object matches that of the written
Expand All @@ -1213,7 +1213,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
&server_rc, &list_count, &list_id));
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmList:%d, server_rc:%d count:%u id:%u\n", ret,
server_rc, list_count, list_id);
(int)server_rc, (unsigned int)list_count, (unsigned int)list_id);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);

Expand All @@ -1231,7 +1231,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmDestroyObjects:%d, server_rc:%d for "
"id:%u with count:%u\n",
ret, server_rc, list_id, list_count);
ret, (int)server_rc, (unsigned int)list_id, (unsigned int)list_count);
#endif

/* Ensure object was destroyed and no longer exists */
Expand All @@ -1245,7 +1245,7 @@ int whTest_ClientCfg(whClientConfig* clientCfg)

WH_TEST_RETURN_ON_FAIL(ret = wh_Client_NvmCleanup(client, &server_rc));
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmCleanup:%d, server_rc:%d\n", ret, server_rc);
printf("Client NvmCleanup:%d, server_rc:%d\n", ret, (int)server_rc);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);

Expand All @@ -1255,8 +1255,8 @@ int whTest_ClientCfg(whClientConfig* clientCfg)
#if defined(WH_CFG_TEST_VERBOSE)
printf("Client NvmGetAvailable:%d, server_rc:%d, avail_size:%d "
"avail_objects:%d, reclaim_size:%d reclaim_objects:%d\n",
ret, server_rc, avail_size, avail_objects, reclaim_size,
reclaim_objects);
ret, (int)server_rc, (int)avail_size, (int)avail_objects, (int)reclaim_size,
(int)reclaim_objects);
#endif
WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
WH_TEST_ASSERT_RETURN(avail_objects == NF_OBJECT_COUNT);
Expand Down
4 changes: 2 additions & 2 deletions test/wh_test_crypto.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,12 +380,12 @@ int whTest_CryptoClientConfig(whClientConfig* config)
}

outLen = sizeof(sharedOne);
if ((ret = wc_curve25519_shared_secret(curve25519PrivateKey, curve25519PublicKey, sharedOne, &outLen)) != 0) {
if ((ret = wc_curve25519_shared_secret(curve25519PrivateKey, curve25519PublicKey, sharedOne, (word32*)&outLen)) != 0) {
WH_ERROR_PRINT("Failed to wc_curve25519_shared_secret %d\n", ret);
goto exit;
}

if ((ret = wc_curve25519_shared_secret(curve25519PublicKey, curve25519PrivateKey, sharedTwo, &outLen)) != 0) {
if ((ret = wc_curve25519_shared_secret(curve25519PublicKey, curve25519PrivateKey, sharedTwo, (word32*)&outLen)) != 0) {
WH_ERROR_PRINT("Failed to wc_curve25519_shared_secret %d\n", ret);
goto exit;
}
Expand Down
Loading

0 comments on commit 62ff7cb

Please sign in to comment.