yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clarify state handling in find_parent(_in)()

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2017-08-23 11:20:48 +02:00
parent 83e923ba2b
commit 3627a8b2f6
1 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
library/x509_crt.c
View file

@ -1992,13 +1992,20 @@ static int x509_crt_find_parent_in(
int signature_is_good, fallback_sign_good; int signature_is_good, fallback_sign_good;
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
/* restore state if we have some stored */ /* did we have something in progress? */
if( rs_ctx != NULL && rs_ctx->parent != NULL ) if( rs_ctx != NULL && rs_ctx->parent != NULL )
{ {
/* restore saved state */
parent = rs_ctx->parent; parent = rs_ctx->parent;
fallback_parent = rs_ctx->fallback_parent; fallback_parent = rs_ctx->fallback_parent;
fallback_sign_good = rs_ctx->fallback_sign_good; fallback_sign_good = rs_ctx->fallback_sign_good;
/* clear saved state */
rs_ctx->parent = NULL;
rs_ctx->fallback_parent = NULL;
rs_ctx->fallback_sign_good = 0;
/* resume where we left */
goto check_signature; goto check_signature;
} }
#endif #endif
@ -2070,16 +2077,6 @@ check_signature:
*r_signature_is_good = fallback_sign_good; *r_signature_is_good = fallback_sign_good;
} }
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
if( rs_ctx != NULL )
{
/* reset state */
rs_ctx->parent = NULL;
rs_ctx->fallback_parent = NULL;
rs_ctx->fallback_sign_good = 0;
}
#endif
return( 0 ); return( 0 );
} }
@ -2116,9 +2113,12 @@ static int x509_crt_find_parent(
*parent_is_trusted = 1; *parent_is_trusted = 1;
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
/* restore state if we have some stored */ /* restore then clear saved state if we have some stored */
if( rs_ctx != NULL && rs_ctx->parent_is_trusted != -1) if( rs_ctx != NULL && rs_ctx->parent_is_trusted != -1 )
{
*parent_is_trusted = rs_ctx->parent_is_trusted; *parent_is_trusted = rs_ctx->parent_is_trusted;
rs_ctx->parent_is_trusted = -1;
}
#endif #endif
while( 1 ) { while( 1 ) {
@ -2155,12 +2155,6 @@ static int x509_crt_find_parent(
signature_is_good = 0; signature_is_good = 0;
} }
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
/* reset state */
if( rs_ctx != NULL )
rs_ctx->parent_is_trusted = -1;
#endif
return( 0 ); return( 0 );
} }
@ -2254,7 +2248,7 @@ static int x509_crt_verify_chain(
/* resume if we had an operation in progress */ /* resume if we had an operation in progress */
if( rs_ctx != NULL && rs_ctx->child != NULL ) if( rs_ctx != NULL && rs_ctx->child != NULL )
{ {
/* save state */ /* restore saved state */
child = rs_ctx->child; child = rs_ctx->child;
self_cnt = rs_ctx->self_cnt; self_cnt = rs_ctx->self_cnt;
*ver_chain = rs_ctx->ver_chain; *ver_chain = rs_ctx->ver_chain;