[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  efc21a513f1c5227cb56372fa65270f49d234b09 (commit)
      from  0904e79a6e6109240d5a552f2699408b26cf63ee (commit)


- Log -----------------------------------------------------------------
commit efc21a513f1c5227cb56372fa65270f49d234b09
Author: Pauli <paul.dale at oracle.com>
Date:   Wed Jul 5 13:40:23 2017 +1000

    Fix compiler warnings
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/3839)

-----------------------------------------------------------------------

Summary of changes:
 test/ct_test.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/ct_test.c b/test/ct_test.c
index b44a41c..5deb758 100644
--- a/test/ct_test.c
+++ b/test/ct_test.c
@@ -488,14 +488,14 @@ end:
 
 static int test_ctlog_from_base64(void)
 {
-    CTLOG *log = NULL;
+    CTLOG *ctlogp = NULL;
     const char notb64[] = "\01\02\03\04";
     const char pad[] = "====";
     const char name[] = "name";
 
     /* We expect these to both fail! */
-    if (!TEST_true(!CTLOG_new_from_base64(&log, notb64, name))
-        || !TEST_true(!CTLOG_new_from_base64(&log, pad, name)))
+    if (!TEST_true(!CTLOG_new_from_base64(&ctlogp, notb64, name))
+        || !TEST_true(!CTLOG_new_from_base64(&ctlogp, pad, name)))
         return 0;
     return 1;
 }