diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 12 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.h | 2 |
3 files changed, 17 insertions, 8 deletions
@@ -1,3 +1,14 @@ +Wed Dec 2 07:43:51 2015 Eric Wong <e@80x24.org> + + * ext/openssl/ossl_ssl.c (mSSLExtConfig): make static + (eSSLError): ditto + (ID_callback_state): ditto + (ossl_ssl_ex_vcb_idx): ditto + (ossl_ssl_ex_store_p): ditto + (ossl_ssl_ex_ptr_idx): ditto + * ext/openssl/ossl_ssl.h: remove extern declarations for + mSSLExtConfig and eSSLError + Wed Dec 2 07:41:08 2015 Eric Wong <e@80x24.org> * missing/explicit_bzero.c (explicit_bzero): fixup r52839 diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 538ba37f24..553eb14252 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -28,8 +28,8 @@ } while (0) VALUE mSSL; -VALUE mSSLExtConfig; -VALUE eSSLError; +static VALUE mSSLExtConfig; +static VALUE eSSLError; VALUE cSSLContext; VALUE cSSLSocket; @@ -75,7 +75,7 @@ static VALUE eSSLErrorWaitWritable; #define ossl_ssl_set_tmp_dh(o,v) rb_iv_set((o),"@tmp_dh",(v)) #define ossl_ssl_set_tmp_ecdh(o,v) rb_iv_set((o),"@tmp_ecdh",(v)) -ID ID_callback_state; +static ID ID_callback_state; static VALUE sym_exception, sym_wait_readable, sym_wait_writable; @@ -120,9 +120,9 @@ static const struct { #undef OSSL_SSL_METHOD_ENTRY }; -int ossl_ssl_ex_vcb_idx; -int ossl_ssl_ex_store_p; -int ossl_ssl_ex_ptr_idx; +static int ossl_ssl_ex_vcb_idx; +static int ossl_ssl_ex_store_p; +static int ossl_ssl_ex_ptr_idx; static void ossl_sslctx_free(void *ptr) diff --git a/ext/openssl/ossl_ssl.h b/ext/openssl/ossl_ssl.h index f92f0289d6..909f6798c4 100644 --- a/ext/openssl/ossl_ssl.h +++ b/ext/openssl/ossl_ssl.h @@ -29,9 +29,7 @@ extern const rb_data_type_t ossl_ssl_type; extern const rb_data_type_t ossl_ssl_session_type; extern VALUE mSSL; -extern VALUE eSSLError; extern VALUE cSSLSocket; -extern VALUE cSSLContext; extern VALUE cSSLSession; void Init_ossl_ssl(void); |