diff --git a/.github/workflows/freertos_plus_demos.yml b/.github/workflows/freertos_plus_demos.yml index 95e819b8e..14c665845 100644 --- a/.github/workflows/freertos_plus_demos.yml +++ b/.github/workflows/freertos_plus_demos.yml @@ -20,7 +20,7 @@ env: jobs: winsim_cellular: name: Windows Simulator Cellular Demos - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -128,7 +128,7 @@ jobs: winsim_coreHTTP: name: coreHTTP WinSim Demos - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -281,7 +281,7 @@ jobs: winsim_corePKCS11: name: corePKCS11 WinSim Demos - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -321,7 +321,7 @@ jobs: echo "::group::${{ env.stepName }}" Push-Location Get-Location - & "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" + & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" Get-Location Pop-Location @@ -370,7 +370,7 @@ jobs: winsim_corelibs: name: core Library Windows Simulator Demos - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -425,7 +425,7 @@ jobs: echo "::group::${{ env.stepName }}" Push-Location Get-Location - & "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" + & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" Get-Location Pop-Location @@ -862,7 +862,7 @@ jobs: winsim_aws_iot: name: AWS IoT Windows Simulator Demos - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -1146,7 +1146,7 @@ jobs: plus_tcp_winsim: name: FreeRTOS+TCP Windows Simulator Demos - runs-on: windows-2019 + runs-on: windows-latest continue-on-error: true steps: - name: Checkout Repository @@ -1181,7 +1181,7 @@ jobs: echo "::group::${{ env.stepName }}" Push-Location Get-Location - & "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" + & "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" Get-Location Pop-Location @@ -1303,7 +1303,7 @@ jobs: winsim_plus_demos: name: FreeRTOS+CLI Windows Simulator Demos - runs-on: windows-2019 + runs-on: windows-latest continue-on-error: true steps: - name: Checkout Repository diff --git a/FreeRTOS-Plus/Source/Application-Protocols/network_transport/mbedtls_pk_pkcs11.c b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/mbedtls_pk_pkcs11.c index b352d26aa..1cd60a3a0 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/network_transport/mbedtls_pk_pkcs11.c +++ b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/mbedtls_pk_pkcs11.c @@ -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 ); } /*-----------------------------------------------------------*/ diff --git a/FreeRTOS-Plus/Source/Application-Protocols/network_transport/transport_mbedtls_pkcs11.c b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/transport_mbedtls_pkcs11.c index 0a98b1f55..a73ba3b89 100644 --- a/FreeRTOS-Plus/Source/Application-Protocols/network_transport/transport_mbedtls_pkcs11.c +++ b/FreeRTOS-Plus/Source/Application-Protocols/network_transport/transport_mbedtls_pkcs11.c @@ -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;