Fix -Wcast-qual errors in _Label functions by making _common helpers accept const void* data parameter.

This commit is contained in:
night1rider
2026-04-06 11:12:37 -06:00
parent 48e8442e35
commit 88396d7d12
3 changed files with 9 additions and 9 deletions
+3 -3
View File
@@ -13567,7 +13567,7 @@ int wc_AesCcmEncrypt_ex(Aes* aes, byte* out, const byte* in, word32 sz,
#endif
static Aes* _AesNew_common(void* heap, int devId, int *result_code,
int aesInitType, void* aesInitData,
int aesInitType, const void* aesInitData,
int aesInitDataLen)
{
int ret;
@@ -13579,7 +13579,7 @@ static Aes* _AesNew_common(void* heap, int devId, int *result_code,
switch (aesInitType) {
#ifdef WOLF_PRIVATE_KEY_ID
case AES_NEW_INIT_ID:
ret = wc_AesInit_Id(aes, (unsigned char*)aesInitData,
ret = wc_AesInit_Id(aes, (unsigned char*)(uintptr_t)aesInitData,
aesInitDataLen, heap, devId);
break;
case AES_NEW_INIT_LABEL:
@@ -13625,7 +13625,7 @@ Aes* wc_AesNew_Label(const char* label, void* heap, int devId,
int *result_code)
{
return _AesNew_common(heap, devId, result_code,
AES_NEW_INIT_LABEL, (void*)label, 0);
AES_NEW_INIT_LABEL, label, 0);
}
#endif /* WOLF_PRIVATE_KEY_ID */
+3 -3
View File
@@ -106,7 +106,7 @@ void ShiftAndXorRb(byte* out, byte* in)
static int _InitCmac_common(Cmac* cmac, const byte* key, word32 keySz,
int type, void* unused, void* heap, int devId,
int aesInitType, void* aesInitData,
int aesInitType, const void* aesInitData,
int aesInitDataLen)
{
int ret = 0;
@@ -178,7 +178,7 @@ static int _InitCmac_common(Cmac* cmac, const byte* key, word32 keySz,
switch (aesInitType) {
#ifdef WOLF_PRIVATE_KEY_ID
case CMAC_AES_INIT_ID:
ret = wc_AesInit_Id(&cmac->aes, (unsigned char*)aesInitData,
ret = wc_AesInit_Id(&cmac->aes, (unsigned char*)(uintptr_t)aesInitData,
aesInitDataLen, heap, devId);
break;
case CMAC_AES_INIT_LABEL:
@@ -271,7 +271,7 @@ int wc_InitCmac_Label(Cmac* cmac, const byte* key, word32 keySz,
void* heap, int devId)
{
return _InitCmac_common(cmac, key, keySz, type, unused, heap, devId,
CMAC_AES_INIT_LABEL, (void*)label, 0);
CMAC_AES_INIT_LABEL, label, 0);
}
#endif /* WOLF_PRIVATE_KEY_ID */
+3 -3
View File
@@ -192,7 +192,7 @@ static void wc_RsaCleanup(RsaKey* key)
#endif
static RsaKey* _NewRsaKey_common(void* heap, int devId, int *result_code,
int rsaInitType, void* rsaInitData,
int rsaInitType, const void* rsaInitData,
int rsaInitDataLen)
{
int ret;
@@ -204,7 +204,7 @@ static RsaKey* _NewRsaKey_common(void* heap, int devId, int *result_code,
switch (rsaInitType) {
#ifdef WOLF_PRIVATE_KEY_ID
case RSA_NEW_INIT_ID:
ret = wc_InitRsaKey_Id(key, (unsigned char*)rsaInitData,
ret = wc_InitRsaKey_Id(key, (unsigned char*)(uintptr_t)rsaInitData,
rsaInitDataLen, heap, devId);
break;
case RSA_NEW_INIT_LABEL:
@@ -250,7 +250,7 @@ RsaKey* wc_NewRsaKey_Label(const char* label, void* heap, int devId,
int *result_code)
{
return _NewRsaKey_common(heap, devId, result_code,
RSA_NEW_INIT_LABEL, (void*)label, 0);
RSA_NEW_INIT_LABEL, label, 0);
}
#endif /* WOLF_PRIVATE_KEY_ID */