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

Check the size_t isn't larger than 32 bit 

Assure that `size_t` isn't larger than 32 bit, with preprocessor check.
Using `#if SIZE_MAX > UINT_MAX`.
pull/6794/head
Ron Eldor 2018-05-23 08:37:27 +03:00
parent 4fd86888ea
commit 77e87d3174
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/cryptocell/FEATURE_CRYPTOCELL310/ccm_alt.c
View File

@ -85,7 +85,7 @@ int mbedtls_ccm_encrypt_and_tag( mbedtls_ccm_context *ctx, size_t length,
if( iv_len < 7 || iv_len > 13 ) if( iv_len < 7 || iv_len > 13 )
return ( MBEDTLS_ERR_CCM_BAD_INPUT ); return ( MBEDTLS_ERR_CCM_BAD_INPUT );
#if defined(MBEDTLS_HAVE_INT64) #if SIZE_MAX > UINT_MAX
if( length > 0xFFFFFFFF || add_len > 0xFFFFFFFF ) if( length > 0xFFFFFFFF || add_len > 0xFFFFFFFF )
return ( MBEDTLS_ERR_CCM_BAD_INPUT ); return ( MBEDTLS_ERR_CCM_BAD_INPUT );
#endif #endif
@ -122,7 +122,7 @@ int mbedtls_ccm_auth_decrypt( mbedtls_ccm_context *ctx, size_t length,
if( iv_len < 7 || iv_len > 13 ) if( iv_len < 7 || iv_len > 13 )
return ( MBEDTLS_ERR_CCM_BAD_INPUT ); return ( MBEDTLS_ERR_CCM_BAD_INPUT );
#if defined(MBEDTLS_HAVE_INT64) #if SIZE_MAX > UINT_MAX
if( length > 0xFFFFFFFF || add_len > 0xFFFFFFFF ) if( length > 0xFFFFFFFF || add_len > 0xFFFFFFFF )
return ( MBEDTLS_ERR_CCM_BAD_INPUT ); return ( MBEDTLS_ERR_CCM_BAD_INPUT );
#endif #endif

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

@ -78,7 +78,7 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
mbedtls_rand_func_container cc_rand = { f_rng, p_rng }; mbedtls_rand_func_container cc_rand = { f_rng, p_rng };
const CRYS_ECPKI_Domain_t* pDomain = CRYS_ECPKI_GetEcDomain ( convert_mbedtls_grp_id_to_crys_domain_id( grp->id ) ); const CRYS_ECPKI_Domain_t* pDomain = CRYS_ECPKI_GetEcDomain ( convert_mbedtls_grp_id_to_crys_domain_id( grp->id ) );
#if defined(MBEDTLS_HAVE_INT64) #if SIZE_MAX > UINT_MAX
if( blen > 0xFFFFFFFF ) if( blen > 0xFFFFFFFF )
{ {
return ( MBEDTLS_ERR_ECP_BAD_INPUT_DATA ); return ( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
@ -176,7 +176,7 @@ int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,
uint32_t signature_size = ( ( grp->nbits + 7 ) / 8 ) * 2; uint32_t signature_size = ( ( grp->nbits + 7 ) / 8 ) * 2;
const CRYS_ECPKI_Domain_t* pDomain = CRYS_ECPKI_GetEcDomain ( convert_mbedtls_grp_id_to_crys_domain_id( grp->id ) ); const CRYS_ECPKI_Domain_t* pDomain = CRYS_ECPKI_GetEcDomain ( convert_mbedtls_grp_id_to_crys_domain_id( grp->id ) );
#if defined(MBEDTLS_HAVE_INT64) #if SIZE_MAX > UINT_MAX
if( blen > 0xFFFFFFFF ) if( blen > 0xFFFFFFFF )
{ {
return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA ); return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );