commit 78d7e8cbc78443660c1a4e4c94ac109edbddf368
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Jul 02 12:33:14 2018 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Mon Jul 02 12:33:14 2018 +0200
tree 85c33756a999ababe602067dbe0bb9186b83b2a9
parent 4edb9cbbc0a07a650946c0e83c7325093672c902

Rename internal variable for consistency

include/mbedtls/x509_crt.h

diff --git a/include/mbedtls/x509_crt.h b/include/mbedtls/x509_crt.h
index 1c3007d..d794b66 100644
--- a/include/mbedtls/x509_crt.h
+++ b/include/mbedtls/x509_crt.h
@@ -178,7 +178,7 @@
     /* 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 */

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index 4022cee..588b484 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -2010,7 +2010,7 @@
 {
     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 @@
         /* 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 @@
 #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 @@
             /* 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 @@
             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 @@
     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 @@
 
     ctx->parent = NULL;
     ctx->fallback_parent = NULL;
-    ctx->fallback_sign_good = 0;
+    ctx->fallback_signature_is_good = 0;
 
     ctx->parent_is_trusted = -1;