[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  ce023e77d7b208016276157fa14a6e2636649e85 (commit)
      from  24f0b10462792c202a0fe1952974fcace1e2c563 (commit)


- Log -----------------------------------------------------------------
commit ce023e77d7b208016276157fa14a6e2636649e85
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Thu Feb 11 13:44:53 2016 -0500

    Fix MacOS/X build warnings
    
    Commit 7823d792d0cad3b44ad5389a8d3381becefe7f44 added DEFINE_LHASH_OF
    to a C source file.  DEFINE_LHASH_OF() and DEFINE_STACK_OF() must
    be used only in header files to avoid clang warnings for unused
    static-inline functions.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 ssl/ssl_cert.c | 2 --
 ssl/ssl_locl.h | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c
index cc82fff..faa7a95 100644
--- a/ssl/ssl_cert.c
+++ b/ssl/ssl_cert.c
@@ -647,8 +647,6 @@ static unsigned long xname_hash(const X509_NAME *a)
     return X509_NAME_hash((X509_NAME *)a);
 }
 
-DEFINE_LHASH_OF(X509_NAME);
-
 /**
  * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed;
  * it doesn't really have anything to do with clients (except that a common use
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index d7a7d01..7fdb263 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -685,7 +685,8 @@ struct ssl_comp_st {
 };
 
 DEFINE_LHASH_OF(SSL_SESSION);
-
+/* Needed in ssl_cert.c */
+DEFINE_LHASH_OF(X509_NAME);
 
 struct ssl_ctx_st {
     const SSL_METHOD *method;