yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-29 08:44:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename internal variable for consistency

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2018-07-02 12:33:14 +02:00
parent 4edb9cbbc0
commit 78d7e8cbc7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbedtls/x509_crt.h
View File

@ -178,7 +178,7 @@ typedef struct
/* for find_parent_in() */ /* for find_parent_in() */
mbedtls_x509_crt *parent; /* non-null iff parent_in in progress */ mbedtls_x509_crt *parent; /* non-null iff parent_in in progress */
mbedtls_x509_crt *fallback_parent; mbedtls_x509_crt *fallback_parent;
int fallback_sign_good; int fallback_signature_is_good;
/* for find_parent() */ /* for find_parent() */
int parent_is_trusted; /* -1 if find_parent is not in progress */ int parent_is_trusted; /* -1 if find_parent is not in progress */

16
library/x509_crt.c
View File

@ -2010,7 +2010,7 @@ static int x509_crt_find_parent_in(
{ {
int ret; int ret;
mbedtls_x509_crt *parent, *fallback_parent; mbedtls_x509_crt *parent, *fallback_parent;
int signature_is_good, fallback_sign_good; int signature_is_good, fallback_signature_is_good;
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
/* did we have something in progress? */ /* did we have something in progress? */
@ -2019,12 +2019,12 @@ static int x509_crt_find_parent_in(
/* restore saved state */ /* 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_signature_is_good = rs_ctx->fallback_signature_is_good;
/* clear saved state */ /* clear saved state */
rs_ctx->parent = NULL; rs_ctx->parent = NULL;
rs_ctx->fallback_parent = NULL; rs_ctx->fallback_parent = NULL;
rs_ctx->fallback_sign_good = 0; rs_ctx->fallback_signature_is_good = 0;
/* resume where we left */ /* resume where we left */
goto check_signature; goto check_signature;
@ -2032,7 +2032,7 @@ static int x509_crt_find_parent_in(
#endif #endif
fallback_parent = NULL; fallback_parent = NULL;
fallback_sign_good = 0; fallback_signature_is_good = 0;
for( parent = candidates; parent != NULL; parent = parent->next ) for( parent = candidates; parent != NULL; parent = parent->next )
{ {
@ -2059,7 +2059,7 @@ check_signature:
/* save state */ /* save state */
rs_ctx->parent = parent; rs_ctx->parent = parent;
rs_ctx->fallback_parent = fallback_parent; rs_ctx->fallback_parent = fallback_parent;
rs_ctx->fallback_sign_good = fallback_sign_good; rs_ctx->fallback_signature_is_good = fallback_signature_is_good;
return( ret ); return( ret );
} }
@ -2078,7 +2078,7 @@ check_signature:
if( fallback_parent == NULL ) if( fallback_parent == NULL )
{ {
fallback_parent = parent; fallback_parent = parent;
fallback_sign_good = signature_is_good; fallback_signature_is_good = signature_is_good;
} }
continue; continue;
@ -2095,7 +2095,7 @@ check_signature:
else else
{ {
*r_parent = fallback_parent; *r_parent = fallback_parent;
*r_signature_is_good = fallback_sign_good; *r_signature_is_good = fallback_signature_is_good;
} }
return( 0 ); return( 0 );
@ -2704,7 +2704,7 @@ void mbedtls_x509_crt_restart_init( mbedtls_x509_crt_restart_ctx *ctx )
ctx->parent = NULL; ctx->parent = NULL;
ctx->fallback_parent = NULL; ctx->fallback_parent = NULL;
ctx->fallback_sign_good = 0; ctx->fallback_signature_is_good = 0;
ctx->parent_is_trusted = -1; ctx->parent_is_trusted = -1;