Skip to content

Change to mbedtls_platform_zeroize() #9218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2019
Merged

Change to mbedtls_platform_zeroize() #9218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions features/cryptocell/FEATURE_CRYPTOCELL310/ecdh_alt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,10 @@
#include "crys_ecpki_domain.h"
#include "crys_ec_mont_api.h"
#include "mbedtls/platform.h"
#include "mbedtls/platform_util.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)
int mbedtls_ecdh_gen_public( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp_point *Q,
int ( *f_rng )( void *, unsigned char *, size_t ),
Expand Down Expand Up @@ -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) ) );
if( ret != 0 )
{
mbedtls_zeroize( temp_buf, sizeof( temp_buf ) );
mbedtls_platform_zeroize( temp_buf, sizeof( temp_buf ) );
goto cleanup;
}

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
Expand Down Expand Up @@ -124,7 +119,7 @@ int mbedtls_ecdh_gen_public( mbedtls_ecp_group *grp, mbedtls_mpi *d, mbedtls_ecp

if ( pHeap )
{
mbedtls_zeroize( pHeap, heapSize );
mbedtls_platform_zeroize( pHeap, heapSize );
mbedtls_free( pHeap );
}

Expand Down Expand Up @@ -190,7 +185,7 @@ int mbedtls_ecdh_compute_shared( mbedtls_ecp_group *grp, mbedtls_mpi *z,
temp_buf,
mbedtls_mpi_size( d ),
&ecdhParams->privKey ) );
mbedtls_zeroize( temp_buf, sizeof( temp_buf ) );
mbedtls_platform_zeroize( temp_buf, sizeof( temp_buf ) );
if ( ret != 0 )
{
goto cleanup;
Expand Down Expand Up @@ -241,13 +236,13 @@ int mbedtls_ecdh_compute_shared( mbedtls_ecp_group *grp, mbedtls_mpi *z,

if ( pHeap )
{
mbedtls_zeroize( pHeap, heapSize );
mbedtls_platform_zeroize( pHeap, heapSize );
mbedtls_free ( pHeap );
}

if ( secret )
{
mbedtls_zeroize( secret, secret_size_in_heap );
mbedtls_platform_zeroize( secret, secret_size_in_heap );
mbedtls_free ( secret );
}

Expand Down
25 changes: 10 additions & 15 deletions features/cryptocell/FEATURE_CRYPTOCELL310/ecdsa_alt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,9 @@
#include "crys_ecpki_domain.h"
#include "crys_ec_edw_api.h"
#include "mbedtls/platform.h"
#include "mbedtls/platform_util.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 )
{
CRYS_ECPKI_HASH_OpMode_t hash_mode;
Expand Down Expand Up @@ -110,7 +105,7 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
if( CrysRet != CRYS_OK )
{
ret = convert_CrysError_to_mbedtls_err( CrysRet );
mbedtls_zeroize( temp_buf, sizeof(temp_buf) );
mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );
goto cleanup;
}

Expand All @@ -123,7 +118,7 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
blen,
pSignature,
&signature_size );
mbedtls_zeroize( temp_buf, sizeof(temp_buf) );
mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );
if( CrysRet != CRYS_OK )
{
ret = convert_CrysError_to_mbedtls_err( CrysRet );
Expand All @@ -145,13 +140,13 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,

if ( pHeap )
{
mbedtls_zeroize( pHeap, heapSize );
mbedtls_platform_zeroize( pHeap, heapSize );
mbedtls_free( pHeap );
}

if( pSignature )
{
mbedtls_zeroize( pSignature, signature_size_for_heap );
mbedtls_platform_zeroize( pSignature, signature_size_for_heap );
mbedtls_free( pSignature );

}
Expand Down Expand Up @@ -232,13 +227,13 @@ int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,

if( pHeap )
{
mbedtls_zeroize( pHeap, heapSize );
mbedtls_platform_zeroize( pHeap, heapSize );
mbedtls_free( pHeap );
}

if( pSignature )
{
mbedtls_zeroize( pSignature, signature_size );
mbedtls_platform_zeroize( pSignature, signature_size );
mbedtls_free( pSignature );

}
Expand Down Expand Up @@ -301,12 +296,12 @@ int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
if ( CrysRet != CRYS_OK )
{
ret = convert_CrysError_to_mbedtls_err( CrysRet );
mbedtls_zeroize( temp_buf, sizeof(temp_buf) );
mbedtls_platform_zeroize( temp_buf, sizeof(temp_buf) );
goto cleanup;
}

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 )
{
goto cleanup;
Expand All @@ -319,7 +314,7 @@ int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
cleanup:
if ( pHeap )
{
mbedtls_zeroize( pHeap, heapSize );
mbedtls_platform_zeroize( pHeap, heapSize );
mbedtls_free ( pHeap );
}
return ( ret );
Expand Down