ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change to mbedtls_platform_zeroize() 

Change the use of the local static function `mbedtls_zeroize()` to
the Mbed TLS platform function `mbedtls_platform_zeroize()`.
pull/9370/head
Ron Eldor 2019-01-01 13:54:18 +02:00 committed by adbridge
parent ea044c6046
commit 2de0911b0c
2 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
features/cryptocell/FEATURE_CRYPTOCELL310/ecdh_alt.c
View File

@ -27,15 +27,10 @@
#include "crys_ecpki_domain.h" #include "crys_ecpki_domain.h"
#include "crys_ec_mont_api.h" #include "crys_ec_mont_api.h"
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#include "mbedtls/platform_util.h"
#include "cc_internal.h" #include "cc_internal.h"
/* Implementation that should never be optimized out by the compiler */
static void mbedtls_zeroize( void *v, size_t n ) {
volatile unsigned char *p = (unsigned char*)v;
while( n-- ) *p++ = 0;
}
#if defined (MBEDTLS_ECDH_GEN_PUBLIC_ALT) #if defined (MBEDTLS_ECDH_GEN_PUBLIC_ALT)
int mbedtls_ecdh_gen_public( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp_point *Q, int mbedtls_ecdh_gen_public( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp_point *Q,
int ( *f_rng )( void *, unsigned char *, size_t ), int ( *f_rng )( void *, unsigned char *, size_t ),
@ -84,12 +79,12 @@ int mbedtls_ecdh_gen_public( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp
4*((((grp->nbits+7)/8)+3)/4) ) ); 4*((((grp->nbits+7)/8)+3)/4) ) );
if( ret != 0 ) if( ret != 0 )
{ {
mbedtls_zeroize( temp_buf, sizeof( temp_buf ) ); mbedtls_platform_zeroize( temp_buf, sizeof( temp_buf ) );
goto cleanup; goto cleanup;
} }
MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary( d, temp_buf, (grp->nbits+7)/8 ) ); MBEDTLS_MPI_CHK(mbedtls_mpi_read_binary( d, temp_buf, (grp->nbits+7)/8 ) );
mbedtls_zeroize( temp_buf, sizeof( temp_buf ) ); mbedtls_platform_zeroize( temp_buf, sizeof( temp_buf ) );
} }
/* if CRYS_ECPKI_GetEcDomain returns NULL, then the given curve is either Montgomery 25519 /* if CRYS_ECPKI_GetEcDomain returns NULL, then the given curve is either Montgomery 25519
@ -124,7 +119,7 @@ cleanup:
if ( pHeap ) if ( pHeap )
{ {
mbedtls_zeroize( pHeap, heapSize ); mbedtls_platform_zeroize( pHeap, heapSize );
mbedtls_free( pHeap ); mbedtls_free( pHeap );
} }
@ -190,7 +185,7 @@ int mbedtls_ecdh_compute_shared( mbedtls_ecp_group *grp, mbedtls_mpi *z,
temp_buf, temp_buf,
mbedtls_mpi_size( d ), mbedtls_mpi_size( d ),
&ecdhParams->privKey ) ); &ecdhParams->privKey ) );
mbedtls_zeroize( temp_buf, sizeof( temp_buf ) ); mbedtls_platform_zeroize( temp_buf, sizeof( temp_buf ) );
if ( ret != 0 ) if ( ret != 0 )
{ {
goto cleanup; goto cleanup;
@ -241,13 +236,13 @@ cleanup:
if ( pHeap ) if ( pHeap )
{ {
mbedtls_zeroize( pHeap, heapSize ); mbedtls_platform_zeroize( pHeap, heapSize );
mbedtls_free ( pHeap ); mbedtls_free ( pHeap );
} }
if ( secret ) if ( secret )
{ {
mbedtls_zeroize( secret, secret_size_in_heap ); mbedtls_platform_zeroize( secret, secret_size_in_heap );
mbedtls_free ( secret ); mbedtls_free ( secret );
} }

25
features/cryptocell/FEATURE_CRYPTOCELL310/ecdsa_alt.c
View File

@ -27,14 +27,9 @@
#include "crys_ecpki_domain.h" #include "crys_ecpki_domain.h"
#include "crys_ec_edw_api.h" #include "crys_ec_edw_api.h"
#include "mbedtls/platform.h" #include "mbedtls/platform.h"
#include "mbedtls/platform_util.h"
#include "cc_internal.h" #include "cc_internal.h"
/* Implementation that should never be optimized out by the compiler */
static void mbedtls_zeroize( void *v, size_t n ) {
volatile unsigned char *p = (unsigned char*)v;
while( n-- ) *p++ = 0;
}
static CRYS_ECPKI_HASH_OpMode_t message_size_to_hash_mode( size_t blen ) static CRYS_ECPKI_HASH_OpMode_t message_size_to_hash_mode( size_t blen )
{ {
CRYS_ECPKI_HASH_OpMode_t hash_mode; CRYS_ECPKI_HASH_OpMode_t hash_mode;
@ -110,7 +105,7 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
if( CrysRet != CRYS_OK ) if( CrysRet != CRYS_OK )
{ {
ret = convert_CrysError_to_mbedtls_err( CrysRet ); ret = convert_CrysError_to_mbedtls_err( CrysRet );
mbedtls_zeroize( temp_buf, sizeof(temp_buf) ); mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );
goto cleanup; goto cleanup;
} }
@ -123,7 +118,7 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
blen, blen,
pSignature, pSignature,
&signature_size ); &signature_size );
mbedtls_zeroize( temp_buf, sizeof(temp_buf) ); mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );
if( CrysRet != CRYS_OK ) if( CrysRet != CRYS_OK )
{ {
ret = convert_CrysError_to_mbedtls_err( CrysRet ); ret = convert_CrysError_to_mbedtls_err( CrysRet );
@ -145,13 +140,13 @@ cleanup:
if ( pHeap ) if ( pHeap )
{ {
mbedtls_zeroize( pHeap, heapSize ); mbedtls_platform_zeroize( pHeap, heapSize );
mbedtls_free( pHeap ); mbedtls_free( pHeap );
} }
if( pSignature ) if( pSignature )
{ {
mbedtls_zeroize( pSignature, signature_size_for_heap ); mbedtls_platform_zeroize( pSignature, signature_size_for_heap );
mbedtls_free( pSignature ); mbedtls_free( pSignature );
} }
@ -232,13 +227,13 @@ cleanup:
if( pHeap ) if( pHeap )
{ {
mbedtls_zeroize( pHeap, heapSize ); mbedtls_platform_zeroize( pHeap, heapSize );
mbedtls_free( pHeap ); mbedtls_free( pHeap );
} }
if( pSignature ) if( pSignature )
{ {
mbedtls_zeroize( pSignature, signature_size ); mbedtls_platform_zeroize( pSignature, signature_size );
mbedtls_free( pSignature ); mbedtls_free( pSignature );
} }
@ -301,12 +296,12 @@ int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
if ( CrysRet != CRYS_OK ) if ( CrysRet != CRYS_OK )
{ {
ret = convert_CrysError_to_mbedtls_err( CrysRet ); ret = convert_CrysError_to_mbedtls_err( CrysRet );
mbedtls_zeroize( temp_buf, sizeof(temp_buf) ); mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );
goto cleanup; goto cleanup;
} }
ret = mbedtls_mpi_read_binary( &ctx->d, temp_buf, (ctx->grp.nbits+7)/8 ); ret = mbedtls_mpi_read_binary( &ctx->d, temp_buf, (ctx->grp.nbits+7)/8 );
mbedtls_zeroize( temp_buf, sizeof(temp_buf) ); mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );
if ( ret != 0 ) if ( ret != 0 )
{ {
goto cleanup; goto cleanup;
@ -319,7 +314,7 @@ int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
cleanup: cleanup:
if ( pHeap ) if ( pHeap )
{ {
mbedtls_zeroize( pHeap, heapSize ); mbedtls_platform_zeroize( pHeap, heapSize );
mbedtls_free ( pHeap ); mbedtls_free ( pHeap );
} }
return ( ret ); return ( ret );