[openssl-commits] [openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  f9a22815f386dbe7a13822f0ac3629ae8521cd76 (commit)
      from  523fcfb4c081ec346f117fd493103ddcd521e431 (commit)


- Log -----------------------------------------------------------------
commit f9a22815f386dbe7a13822f0ac3629ae8521cd76
Author: Dr. Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Date:   Tue Sep 18 07:56:27 2018 +0200

    ssl/ssl_ciph.c: make set_ciphersuites static
    
    Fixes #7252
    
    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/7253)

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

Summary of changes:
 ssl/ssl_ciph.c | 2 +-
 ssl/ssl_locl.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index b60cc79..14066d0 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1301,7 +1301,7 @@ static int ciphersuite_cb(const char *elem, int len, void *arg)
     return 1;
 }
 
-int set_ciphersuites(STACK_OF(SSL_CIPHER) **currciphers, const char *str)
+static __owur int set_ciphersuites(STACK_OF(SSL_CIPHER) **currciphers, const char *str)
 {
     STACK_OF(SSL_CIPHER) *newciphers = sk_SSL_CIPHER_new_null();
 
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index e8819e7..8afb117 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -2251,7 +2251,6 @@ __owur int ssl_cipher_id_cmp(const SSL_CIPHER *a, const SSL_CIPHER *b);
 DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER, ssl_cipher_id);
 __owur int ssl_cipher_ptr_id_cmp(const SSL_CIPHER *const *ap,
                                  const SSL_CIPHER *const *bp);
-__owur int set_ciphersuites(STACK_OF(SSL_CIPHER) **currciphers, const char *str);
 __owur STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
                                                     STACK_OF(SSL_CIPHER) *tls13_ciphersuites,
                                                     STACK_OF(SSL_CIPHER) **cipher_list,