yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-04 10:24:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/pr/2296' into mbedtls-2.7

Browse Source
This commit is contained in:
Simon Butcher 2019-01-23 09:51:48 +01:00
commit c5b6c2f877
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -5,6 +5,7 @@ mbed TLS ChangeLog (Sorted per branch, date)
Bugfix Bugfix
* Run the AD too long test only if MBEDTLS_CCM_ALT is not defined. * Run the AD too long test only if MBEDTLS_CCM_ALT is not defined.
Raised as a comment in #1996. Raised as a comment in #1996.
* Fix returning the value 1 when mbedtls_ecdsa_genkey failed.
= mbed TLS 2.7.9 branch released 2018-12-21 = mbed TLS 2.7.9 branch released 2018-12-21

9
library/ecdsa.c
View File

@ -420,8 +420,13 @@ cleanup:
int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid, int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid,
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng ) int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
{ {
return( mbedtls_ecp_group_load( &ctx->grp, gid ) || int ret = 0;
mbedtls_ecp_gen_keypair( &ctx->grp, &ctx->d, &ctx->Q, f_rng, p_rng ) ); ret = mbedtls_ecp_group_load( &ctx->grp, gid );
if( ret != 0 )
return( ret );
return( mbedtls_ecp_gen_keypair( &ctx->grp, &ctx->d,
&ctx->Q, f_rng, p_rng ) );
} }
#endif /* MBEDTLS_ECDSA_GENKEY_ALT */ #endif /* MBEDTLS_ECDSA_GENKEY_ALT */