len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-12-07 05:34:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix memory leak in transport_mbedtls_pkcs11.c

Browse source
This commit is contained in:
Paul Bartell 2022-12-06 12:26:49 -08:00 • committed by Paul Bartell
parent 1fc1e01fb6
commit 0ca1ec8861
4 changed files with 2 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/Fleet_Provisioning_With_CSR_Demo/pkcs11_operations.c
View file

@ -263,7 +263,7 @@ bool xGenerateKeyAndCsr( CK_SESSION_HANDLE xP11Session,
mbedtls_x509write_csr_free( &xReq ); mbedtls_x509write_csr_free( &xReq );
lPKCS11PkMbedtlsCloseSessionAndFree( &xPrivKey ); mbedtls_pk_free( &xPrivKey );
} }
*pxOutCsrLength = strlen( pcCsrBuffer ); *pxOutCsrLength = strlen( pcCsrBuffer );

50
FreeRTOS-Plus/Source/Application-Protocols/network_transport/mbedtls_pk_pkcs11.c
View file

@ -387,56 +387,6 @@ CK_RV xPKCS11_initMbedtlsPkContext( mbedtls_pk_context * pxMbedtlsPkCtx,
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
int lPKCS11PkMbedtlsCloseSessionAndFree( mbedtls_pk_context * pxMbedtlsPkCtx )
{
CK_RV xResult = CKR_OK;
P11PkCtx_t * pxP11Ctx = NULL;
CK_FUNCTION_LIST_PTR pxFunctionList = NULL;
configASSERT( pxMbedtlsPkCtx );
if( pxMbedtlsPkCtx )
{
if( pxMbedtlsPkCtx->pk_info->type == MBEDTLS_PK_ECKEY )
{
pxP11Ctx = &( ( ( P11EcDsaCtx_t * ) ( pxMbedtlsPkCtx->pk_ctx ) )->xP11PkCtx );
}
else if( pxMbedtlsPkCtx->pk_info->type == MBEDTLS_PK_RSA )
{
pxP11Ctx = &( ( ( P11RsaCtx_t * ) ( pxMbedtlsPkCtx->pk_ctx ) )->xP11PkCtx );
}
else
{
pxP11Ctx = NULL;
xResult = CKR_FUNCTION_FAILED;
}
}
else
{
xResult = CKR_FUNCTION_FAILED;
}
if( xResult == CKR_OK )
{
xResult = C_GetFunctionList( &pxFunctionList );
}
if( xResult == CKR_OK )
{
configASSERT( pxFunctionList );
xResult = pxFunctionList->C_CloseSession( pxP11Ctx->xSessionHandle );
}
if( xResult == CKR_OK )
{
pxP11Ctx->xSessionHandle = CK_INVALID_HANDLE;
}
return( xResult == CKR_OK ? 0 : -1 );
}
/*-----------------------------------------------------------*/
int lPKCS11RandomCallback( void * pvCtx, int lPKCS11RandomCallback( void * pvCtx,
unsigned char * pucOutput, unsigned char * pucOutput,
size_t uxLen ) size_t uxLen )

11
FreeRTOS-Plus/Source/Application-Protocols/network_transport/mbedtls_pk_pkcs11.h
View file

@ -46,15 +46,6 @@ CK_RV xPKCS11_initMbedtlsPkContext( mbedtls_pk_context * pxMbedtlsPkCtx,
CK_SESSION_HANDLE xSessionHandle, CK_SESSION_HANDLE xSessionHandle,
CK_OBJECT_HANDLE xPkHandle ); CK_OBJECT_HANDLE xPkHandle );
/**
* @brief Close the PKCS11 session and free the relevant pk context.
*
* @param pxMbedtlsPkCtx Pointer to the mbedtls_pk_context to free
* @return 0 on success
* @return A negative number on failure
*/
int lPKCS11PkMbedtlsCloseSessionAndFree( mbedtls_pk_context * pxMbedtlsPkCtx );
/** /**
* @brief Callback to generate random data with the PKCS11 module. * @brief Callback to generate random data with the PKCS11 module.
* *
@ -68,6 +59,4 @@ int lPKCS11RandomCallback( void * pvCtx,
unsigned char * pucOutput, unsigned char * pucOutput,
size_t uxLen ); size_t uxLen );
#endif /* MBEDTLS_PK_PKCS11_H */ #endif /* MBEDTLS_PK_PKCS11_H */

10
FreeRTOS-Plus/Source/Application-Protocols/network_transport/transport_mbedtls_pkcs11.c
View file

@ -179,13 +179,6 @@ static CK_RV readCertificateIntoContext( SSLContext_t * pSslContext,
static CK_RV initializeClientKeys( SSLContext_t * pxCtx, static CK_RV initializeClientKeys( SSLContext_t * pxCtx,
const char * pcLabelName ); const char * pcLabelName );
/**
* @brief Stub function to satisfy mbedtls checks before sign operations
*
* @return 1.
*/
int canDoStub( mbedtls_pk_type_t type );
/** /**
* @brief Sign a cryptographic hash with the private key. * @brief Sign a cryptographic hash with the private key.
* *
@ -237,8 +230,7 @@ static void sslContextFree( SSLContext_t * pSslContext )
mbedtls_x509_crt_free( &( pSslContext->clientCert ) ); mbedtls_x509_crt_free( &( pSslContext->clientCert ) );
mbedtls_ssl_config_free( &( pSslContext->config ) ); mbedtls_ssl_config_free( &( pSslContext->config ) );
mbedtls_pk_free( &( pSslContext->privKey ) );
( void ) lPKCS11PkMbedtlsCloseSessionAndFree( &( pSslContext->privKey ) );
pSslContext->pxP11FunctionList->C_CloseSession( pSslContext->xP11Session ); pSslContext->pxP11FunctionList->C_CloseSession( pSslContext->xP11Session );
} }