[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  f0ff328e360f56d8a79cbb61b2931a13fb7199c2 (commit)
      from  de72be2e5784269088cc77479f41c8aeb82fcf6b (commit)


- Log -----------------------------------------------------------------
commit f0ff328e360f56d8a79cbb61b2931a13fb7199c2
Author: Viktor Szakats <vszakats at users.noreply.github.com>
Date:   Sat Feb 13 18:46:30 2016 +0100

    GH675: make ssl3_ciphers static
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 3e1e60d..8f6eda2 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -159,7 +159,7 @@
 #define SSL3_NUM_CIPHERS        OSSL_NELEM(ssl3_ciphers)
 
 /* list of available SSLv3 ciphers (sorted by id) */
-OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
+static const SSL_CIPHER ssl3_ciphers[] = {
 
 /* The RSA ciphers */
 /* Cipher 01 */
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 913b0e9..dc0db1f 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1691,7 +1691,6 @@ typedef struct ssl3_comp_st {
 # endif
 
 extern SSL3_ENC_METHOD ssl3_undef_enc_method;
-OPENSSL_EXTERN const SSL_CIPHER ssl3_ciphers[];
 
 SSL_METHOD *ssl_bad_method(int ver);