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

Refactor find_parent() to merge two call sites

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2017-08-14 16:11:43 +02:00
parent a4a5d1dbe6
commit 18547b5db6
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
library/x509_crt.c
View File

@ -2051,12 +2051,17 @@ static int x509_crt_find_parent(
mbedtls_x509_crt_restart_ctx *rs_ctx ) mbedtls_x509_crt_restart_ctx *rs_ctx )
{ {
int ret; int ret;
mbedtls_x509_crt *search_list;
/* Look for a parent in trusted CAs */
*parent_is_trusted = 1; *parent_is_trusted = 1;
ret = x509_crt_find_parent_in( child, trust_ca,
while( 1 ) {
search_list = *parent_is_trusted ? trust_ca : child->next;
ret = x509_crt_find_parent_in( child, search_list,
parent, signature_is_good, parent, signature_is_good,
1, path_cnt, self_cnt, rs_ctx ); *parent_is_trusted,
path_cnt, self_cnt, rs_ctx );
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
if( ret == MBEDTLS_ERR_ECP_IN_PROGRESS ) { if( ret == MBEDTLS_ERR_ECP_IN_PROGRESS ) {
@ -2065,21 +2070,20 @@ static int x509_crt_find_parent(
} }
#endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */
if( *parent != NULL ) /* stop here if found or already in second iteration */
return( 0 ); if( *parent != NULL || *parent_is_trusted == 0 )
break;
/* Look for a parent upwards the chain */ /* prepare second iteration */
*parent_is_trusted = 0; *parent_is_trusted = 0;
ret = x509_crt_find_parent_in( child, child->next,
parent, signature_is_good,
0, path_cnt, self_cnt, rs_ctx );
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
if( ret == MBEDTLS_ERR_ECP_IN_PROGRESS ) {
// TODO: stave state
return( ret );
} }
#endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */
/* extra precaution against mistakes in the caller */
if( parent == NULL )
{
parent_is_trusted = 0;
signature_is_good = 0;
}
return( 0 ); return( 0 );
} }