Skip to content

Commit 77e87d3

Browse files
Ron EldorRon Eldor
authored andcommitted
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`.
1 parent 4fd8688 commit 77e87d3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

features/cryptocell/FEATURE_CRYPTOCELL310/ccm_alt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ int mbedtls_ccm_encrypt_and_tag( mbedtls_ccm_context *ctx, size_t length,
8585
if( iv_len < 7 || iv_len > 13 )
8686
return ( MBEDTLS_ERR_CCM_BAD_INPUT );
8787

88-
#if defined(MBEDTLS_HAVE_INT64)
88+
#if SIZE_MAX > UINT_MAX
8989
if( length > 0xFFFFFFFF || add_len > 0xFFFFFFFF )
9090
return ( MBEDTLS_ERR_CCM_BAD_INPUT );
9191
#endif
@@ -122,7 +122,7 @@ int mbedtls_ccm_auth_decrypt( mbedtls_ccm_context *ctx, size_t length,
122122
if( iv_len < 7 || iv_len > 13 )
123123
return ( MBEDTLS_ERR_CCM_BAD_INPUT );
124124

125-
#if defined(MBEDTLS_HAVE_INT64)
125+
#if SIZE_MAX > UINT_MAX
126126
if( length > 0xFFFFFFFF || add_len > 0xFFFFFFFF )
127127
return ( MBEDTLS_ERR_CCM_BAD_INPUT );
128128
#endif

features/cryptocell/FEATURE_CRYPTOCELL310/ecdsa_alt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ int mbedtls_ecdsa_sign( mbedtls_ecp_group *grp, mbedtls_mpi *r, mbedtls_mpi *s,
7878
mbedtls_rand_func_container cc_rand = { f_rng, p_rng };
7979
const CRYS_ECPKI_Domain_t* pDomain = CRYS_ECPKI_GetEcDomain ( convert_mbedtls_grp_id_to_crys_domain_id( grp->id ) );
8080

81-
#if defined(MBEDTLS_HAVE_INT64)
81+
#if SIZE_MAX > UINT_MAX
8282
if( blen > 0xFFFFFFFF )
8383
{
8484
return ( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );
@@ -176,7 +176,7 @@ int mbedtls_ecdsa_verify( mbedtls_ecp_group *grp,
176176
uint32_t signature_size = ( ( grp->nbits + 7 ) / 8 ) * 2;
177177
const CRYS_ECPKI_Domain_t* pDomain = CRYS_ECPKI_GetEcDomain ( convert_mbedtls_grp_id_to_crys_domain_id( grp->id ) );
178178

179-
#if defined(MBEDTLS_HAVE_INT64)
179+
#if SIZE_MAX > UINT_MAX
180180
if( blen > 0xFFFFFFFF )
181181
{
182182
return( MBEDTLS_ERR_ECP_BAD_INPUT_DATA );

0 commit comments

Comments
 (0)