From 78d7e8cbc78443660c1a4e4c94ac109edbddf368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?=
 <manuel.pegourie-gonnard@arm.com>
Date: Mon, 2 Jul 2018 12:33:14 +0200
Subject: [PATCH] Rename internal variable for consistency

---
 include/mbedtls/x509_crt.h |  2 +-
 library/x509_crt.c         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/mbedtls/x509_crt.h b/include/mbedtls/x509_crt.h
index 1c3007d8d..d794b6630 100644
--- a/include/mbedtls/x509_crt.h
+++ b/include/mbedtls/x509_crt.h
@@ -178,7 +178,7 @@ typedef struct
     /* for find_parent_in() */
     mbedtls_x509_crt *parent; /* non-null iff parent_in in progress */
     mbedtls_x509_crt *fallback_parent;
-    int fallback_sign_good;
+    int fallback_signature_is_good;
 
     /* for find_parent() */
     int parent_is_trusted; /* -1 if find_parent is not in progress */
diff --git a/library/x509_crt.c b/library/x509_crt.c
index 4022ceee8..588b484f1 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -2010,7 +2010,7 @@ static int x509_crt_find_parent_in(
 {
     int ret;
     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)
     /* did we have something in progress? */
@@ -2019,12 +2019,12 @@ static int x509_crt_find_parent_in(
         /* restore saved state */
         parent = rs_ctx->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 */
         rs_ctx->parent = NULL;
         rs_ctx->fallback_parent = NULL;
-        rs_ctx->fallback_sign_good = 0;
+        rs_ctx->fallback_signature_is_good = 0;
 
         /* resume where we left */
         goto check_signature;
@@ -2032,7 +2032,7 @@ static int x509_crt_find_parent_in(
 #endif
 
     fallback_parent = NULL;
-    fallback_sign_good = 0;
+    fallback_signature_is_good = 0;
 
     for( parent = candidates; parent != NULL; parent = parent->next )
     {
@@ -2059,7 +2059,7 @@ check_signature:
             /* save state */
             rs_ctx->parent = 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 );
         }
@@ -2078,7 +2078,7 @@ check_signature:
             if( fallback_parent == NULL )
             {
                 fallback_parent = parent;
-                fallback_sign_good = signature_is_good;
+                fallback_signature_is_good = signature_is_good;
             }
 
             continue;
@@ -2095,7 +2095,7 @@ check_signature:
     else
     {
         *r_parent = fallback_parent;
-        *r_signature_is_good = fallback_sign_good;
+        *r_signature_is_good = fallback_signature_is_good;
     }
 
     return( 0 );
@@ -2704,7 +2704,7 @@ void mbedtls_x509_crt_restart_init( mbedtls_x509_crt_restart_ctx *ctx )
 
     ctx->parent = NULL;
     ctx->fallback_parent = NULL;
-    ctx->fallback_sign_good = 0;
+    ctx->fallback_signature_is_good = 0;
 
     ctx->parent_is_trusted = -1;