yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-06-19 11:08:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/pr/2142' into development

Browse source
This commit is contained in:
Simon Butcher 2018-10-27 18:30:08 +01:00
parent ddc9e26b3b b10c66073f
commit da095619bb
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mbedtls/ecp.h
View file

@ -233,7 +233,9 @@ int mbedtls_ecp_check_budget( const mbedtls_ecp_group *grp,
unsigned ops ); unsigned ops );
/* Utility macro for checking and updating ops budget */ /* Utility macro for checking and updating ops budget */
#define MBEDTLS_ECP_BUDGET( ops ) MBEDTLS_MPI_CHK( mbedtls_ecp_check_budget( grp, rs_ctx, ops ) ); #define MBEDTLS_ECP_BUDGET( ops ) \
MBEDTLS_MPI_CHK( mbedtls_ecp_check_budget( grp, rs_ctx, \
(unsigned) (ops) ) );
#else /* MBEDTLS_ECP_RESTARTABLE */ #else /* MBEDTLS_ECP_RESTARTABLE */

11
library/ecp.c
View file

@ -248,9 +248,16 @@ int mbedtls_ecp_check_budget( const mbedtls_ecp_group *grp,
else if( grp->pbits >= 384 ) else if( grp->pbits >= 384 )
ops *= 2; ops *= 2;
/* avoid infinite loops: always allow first step */ /* Avoid infinite loops: always allow first step.
if( rs_ctx->ops_done != 0 && rs_ctx->ops_done + ops > ecp_max_ops ) * Because of that, however, it's not generally true
* that ops_done <= ecp_max_ops, so the check
* ops_done > ecp_max_ops below is mandatory. */
if( ( rs_ctx->ops_done != 0 ) &&
( rs_ctx->ops_done > ecp_max_ops ||
ops > ecp_max_ops - rs_ctx->ops_done ) )
{
return( MBEDTLS_ERR_ECP_IN_PROGRESS ); return( MBEDTLS_ERR_ECP_IN_PROGRESS );
}
/* update running count */ /* update running count */
rs_ctx->ops_done += ops; rs_ctx->ops_done += ops;