[openssl-commits] [openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  50f3994b513ead4da94845bf38222bb71c440fb3 (commit)
      from  d2b863643d94704abd9840519cfc54d22d0481fe (commit)


- Log -----------------------------------------------------------------
commit 50f3994b513ead4da94845bf38222bb71c440fb3
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Thu Aug 16 15:42:55 2018 -0500

    Avoid shadowing 'free' in X509_LOOKUP_met_set_free
    
    gcc 4.6 (arguably erroneously) warns about our use of 'free' as
    the name of a function parameter, when --strict-warnings is enabled:
    
    crypto/x509/x509_meth.c: In function 'X509_LOOKUP_meth_set_free':
    crypto/x509/x509_meth.c:61:12: error: declaration of 'free' shadows a global declaration [-Werror=shadow]
    cc1: all warnings being treated as errors
    make[1]: *** [crypto/x509/x509_meth.o] Error 1
    
    (gcc 4.8 is fine with this code, as are newer compilers.)
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6991)

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

Summary of changes:
 crypto/x509/x509_meth.c    | 4 ++--
 include/openssl/x509_vfy.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/x509/x509_meth.c b/crypto/x509/x509_meth.c
index 05ed4bf..9dc587a 100644
--- a/crypto/x509/x509_meth.c
+++ b/crypto/x509/x509_meth.c
@@ -58,9 +58,9 @@ int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD* method))
 
 int X509_LOOKUP_meth_set_free(
     X509_LOOKUP_METHOD *method,
-    void (*free) (X509_LOOKUP *ctx))
+    void (*free_fn) (X509_LOOKUP *ctx))
 {
-    method->free = free;
+    method->free = free_fn;
     return 1;
 }
 
diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index a657ec2..2adb155 100644
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -401,7 +401,7 @@ int (*X509_LOOKUP_meth_get_new_item(const X509_LOOKUP_METHOD* method))
     (X509_LOOKUP *ctx);
 
 int X509_LOOKUP_meth_set_free(X509_LOOKUP_METHOD *method,
-                              void (*free) (X509_LOOKUP *ctx));
+                              void (*free_fn) (X509_LOOKUP *ctx));
 void (*X509_LOOKUP_meth_get_free(const X509_LOOKUP_METHOD* method))
     (X509_LOOKUP *ctx);