Update code to correct function pointer casting (#1366)
Some checks failed
CI Checks / git-secrets (push) Has been cancelled
CI Checks / formatting (push) Has been cancelled
CI Checks / spell-check (push) Has been cancelled
CI Checks / doxygen (push) Has been cancelled
CI Checks / verify-manifest (push) Has been cancelled
CI Checks / memory-statistics (push) Has been cancelled
CI Checks / proof_ci (push) Has been cancelled
FreeRTOS Demos / WIN32 MSVC (push) Has been cancelled
FreeRTOS Demos / WIN32 MingW (push) Has been cancelled
FreeRTOS Demos / Posix GCC (push) Has been cancelled
FreeRTOS Demos / GNU MSP430 Toolchain (push) Has been cancelled
FreeRTOS Demos / GNU ARM Toolchain (push) Has been cancelled
FreeRTOS MPU Demo / TI-Hercules RM46 and RM57 MPU Demos (push) Has been cancelled
Build FreeRTOS+ Demos / Windows Simulator Cellular Demos (push) Has been cancelled
Build FreeRTOS+ Demos / coreHTTP WinSim Demos (push) Has been cancelled
Build FreeRTOS+ Demos / corePKCS11 WinSim Demos (push) Has been cancelled
Build FreeRTOS+ Demos / core Library Windows Simulator Demos (push) Has been cancelled
Build FreeRTOS+ Demos / AWS IoT Windows Simulator Demos (push) Has been cancelled
Build FreeRTOS+ Demos / FreeRTOS+TCP Posix Simulator Demo (push) Has been cancelled
Build FreeRTOS+ Demos / FreeRTOS+TCP QEMU ARM MPS2 AN385 (push) Has been cancelled
Build FreeRTOS+ Demos / FreeRTOS+TCP Windows Simulator Demos (push) Has been cancelled
Build FreeRTOS+ Demos / FreeRTOS+CLI Windows Simulator Demos (push) Has been cancelled
Kernel Unit Tests / FreeRTOS/Source Submodule Revision (push) Has been cancelled
Kernel Unit Tests / FreeRTOS-Kernel Main Branch (push) Has been cancelled

* Update code to correct function pointer casting

Signed-off-by: Dinh Van Nam <vannam.dinh.xt@renesas.com>

* Update function signature

Signed-off-by: Dinh Van Nam <vannam.dinh.xt@renesas.com>

* Continue updating the function signature and revert a variable

Signed-off-by: Dinh Van Nam <vannam.dinh.xt@renesas.com>

* Fix format

Signed-off-by: Dinh Van Nam <vannam.dinh.xt@renesas.com>

* Fix CI check

Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>

* Fix CI checks

Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>

---------

Signed-off-by: Dinh Van Nam <vannam.dinh.xt@renesas.com>
Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>
Co-authored-by: Gaurav Aggarwal <aggarg@amazon.com>
This commit is contained in:
Dinh Van Nam
2025-08-05 23:09:20 +09:00
committed by GitHub
parent 5cf13754a5
commit 51467d89e0
3 changed files with 38 additions and 38 deletions

View File

@@ -153,7 +153,7 @@ static int p11_ecdsa_sign( mbedtls_pk_context * pk,
* @param pvCtx Void pointer to the relevant P11EcDsaCtx_t.
* @return size_t Bit length of the key.
*/
static size_t p11_ecdsa_get_bitlen( const mbedtls_pk_context * pxMbedtlsPkCtx );
static size_t p11_ecdsa_get_bitlen( mbedtls_pk_context * pxMbedtlsPkCtx );
/**
* @brief Returns true if the pk context can perform the given pk operation.
@@ -185,12 +185,12 @@ static int p11_ecdsa_verify( mbedtls_pk_context * pxMbedtlsPkCtx,
const unsigned char * pucSig,
size_t xSigLen );
static int p11_ecdsa_check_pair( const void * pvPub,
const mbedtls_pk_context * pxMbedtlsPkCtx,
static int p11_ecdsa_check_pair( mbedtls_pk_context * pxPub,
mbedtls_pk_context * pxMbedtlsPkCtx,
int ( * lFRng )( void *, unsigned char *, size_t ),
void * pvPRng );
static void p11_ecdsa_debug( const mbedtls_pk_context * pxMbedtlsPkCtx,
static void p11_ecdsa_debug( mbedtls_pk_context * pxMbedtlsPkCtx,
mbedtls_pk_debug_item * pxItems );
static int prvEcdsaSigToASN1InPlace( unsigned char * pucSig,
@@ -231,7 +231,7 @@ mbedtls_pk_info_t mbedtls_pkcs11_pk_ecdsa =
/*-----------------------------------------------------------*/
static size_t p11_rsa_get_bitlen( const mbedtls_pk_context * ctx );
static size_t p11_rsa_get_bitlen( mbedtls_pk_context * ctx );
static int p11_rsa_can_do( mbedtls_pk_type_t xType );
@@ -252,8 +252,8 @@ static int p11_rsa_sign( mbedtls_pk_context * pk,
int ( * f_rng )( void *, unsigned char *, size_t ),
void * p_rng );
static int p11_rsa_check_pair( const void * pvPub,
const mbedtls_pk_context * pxMbedtlsPkCtx,
static int p11_rsa_check_pair( mbedtls_pk_context * pvPub,
mbedtls_pk_context * pxMbedtlsPkCtx,
int ( * lFRng )( void *, unsigned char *, size_t ),
void * pvPRng );
@@ -266,7 +266,7 @@ static CK_RV p11_rsa_ctx_init( mbedtls_pk_context * pk,
static void p11_rsa_ctx_free( void * pvCtx );
static void p11_rsa_debug( const mbedtls_pk_context * pxMbedtlsPkCtx,
static void p11_rsa_debug( mbedtls_pk_context * pxMbedtlsPkCtx,
mbedtls_pk_debug_item * pxItems );
/*-----------------------------------------------------------*/
@@ -759,11 +759,11 @@ static int p11_ecdsa_sign( mbedtls_pk_context * pk,
/*-----------------------------------------------------------*/
static size_t p11_ecdsa_get_bitlen( const mbedtls_pk_context * pxMbedtlsPkCtx )
static size_t p11_ecdsa_get_bitlen( mbedtls_pk_context * pxMbedtlsPkCtx )
{
configASSERT( mbedtls_ecdsa_info.get_bitlen );
return mbedtls_ecdsa_info.get_bitlen( ( mbedtls_pk_context * ) pxMbedtlsPkCtx );
return mbedtls_ecdsa_info.get_bitlen( pxMbedtlsPkCtx );
}
/*-----------------------------------------------------------*/
@@ -792,14 +792,14 @@ static int p11_ecdsa_verify( mbedtls_pk_context * pxMbedtlsPkCtx,
/*-----------------------------------------------------------*/
static int p11_ecdsa_check_pair( const void * pvPub,
const mbedtls_pk_context * pxMbedtlsPkCtx,
static int p11_ecdsa_check_pair( mbedtls_pk_context * pxPub,
mbedtls_pk_context * pxMbedtlsPkCtx,
int ( * lFRng )( void *, unsigned char *, size_t ),
void * pvPRng )
{
P11EcDsaCtx_t * pxP11PrvKey = ( P11EcDsaCtx_t * ) pxMbedtlsPkCtx->pk_ctx;
mbedtls_ecp_keypair * pxPubKey = ( mbedtls_ecp_keypair * ) pvPub;
mbedtls_ecp_keypair * pxPubKey = ( mbedtls_ecp_keypair * ) pxPub;
mbedtls_ecp_keypair * pxPrvKey = &( pxP11PrvKey->xMbedEcDsaCtx );
int lResult = 0;
@@ -867,7 +867,7 @@ static int p11_ecdsa_check_pair( const void * pvPub,
/*-----------------------------------------------------------*/
static void p11_ecdsa_debug( const mbedtls_pk_context * pxMbedtlsPkCtx,
static void p11_ecdsa_debug( mbedtls_pk_context * pxMbedtlsPkCtx,
mbedtls_pk_debug_item * pxItems )
{
configASSERT( mbedtls_ecdsa_info.debug_func );
@@ -877,13 +877,13 @@ static void p11_ecdsa_debug( const mbedtls_pk_context * pxMbedtlsPkCtx,
/*-----------------------------------------------------------*/
static size_t p11_rsa_get_bitlen( const mbedtls_pk_context * pxMbedtlsPkCtx )
static size_t p11_rsa_get_bitlen( mbedtls_pk_context * pxMbedtlsPkCtx )
{
mbedtls_rsa_context * pxRsaCtx = ( mbedtls_rsa_context * ) pxMbedtlsPkCtx->pk_ctx;
configASSERT( mbedtls_rsa_info.get_bitlen );
return mbedtls_rsa_info.get_bitlen( ( mbedtls_pk_context * ) pxMbedtlsPkCtx );
return mbedtls_rsa_info.get_bitlen( pxMbedtlsPkCtx );
}
/*-----------------------------------------------------------*/
@@ -1002,15 +1002,15 @@ static int p11_rsa_sign( mbedtls_pk_context * pk,
/*-----------------------------------------------------------*/
static int p11_rsa_check_pair( const void * pvPub,
const mbedtls_pk_context * pxMbedtlsPkCtx,
static int p11_rsa_check_pair( mbedtls_pk_context * pxPub,
mbedtls_pk_context * pxMbedtlsPkCtx,
int ( * lFRng )( void *, unsigned char *, size_t ),
void * pvPRng )
{
configASSERT( mbedtls_rsa_info.check_pair_func );
return mbedtls_rsa_info.check_pair_func( ( void * ) pvPub,
( mbedtls_pk_context * ) pxMbedtlsPkCtx,
return mbedtls_rsa_info.check_pair_func( pxPub,
pxMbedtlsPkCtx,
lFRng,
pvPRng );
}
@@ -1105,12 +1105,12 @@ static void p11_rsa_ctx_free( void * pvCtx )
/*-----------------------------------------------------------*/
static void p11_rsa_debug( const mbedtls_pk_context * pxMbedtlsPkCtx,
static void p11_rsa_debug( mbedtls_pk_context * pxMbedtlsPkCtx,
mbedtls_pk_debug_item * pxItems )
{
configASSERT( mbedtls_rsa_info.debug_func );
mbedtls_rsa_info.debug_func( ( mbedtls_pk_context * ) pxMbedtlsPkCtx, pxItems );
mbedtls_rsa_info.debug_func( pxMbedtlsPkCtx, pxItems );
}
/*-----------------------------------------------------------*/

View File

@@ -165,9 +165,9 @@ static TlsTransportStatus_t tlsSetup( NetworkContext_t * pNetworkContext,
*
* @return Zero on success.
*/
static int32_t generateRandomBytes( void * pvCtx,
unsigned char * pucRandom,
size_t xRandomLength );
static int generateRandomBytes( void * pvCtx,
unsigned char * pucRandom,
size_t xRandomLength );
/**
* @brief Helper for reading the specified certificate object, if present,
@@ -544,9 +544,9 @@ static TlsTransportStatus_t tlsSetup( NetworkContext_t * pNetworkContext,
/*-----------------------------------------------------------*/
static int32_t generateRandomBytes( void * pvCtx,
unsigned char * pucRandom,
size_t xRandomLength )
static int generateRandomBytes( void * pvCtx,
unsigned char * pucRandom,
size_t xRandomLength )
{
/* Must cast from void pointer to conform to mbed TLS API. */
SSLContext_t * pxCtx = ( SSLContext_t * ) pvCtx;