diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-05-04 22:39:39 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-05-14 20:00:58 +0900 |
| commit | df6e577094610d51f0c6891edd2c8663af0c07d6 (patch) | |
| tree | 34cb5d4ba1bc116c16d9accfdd522ab8d86a92ab | |
| parent | c925580d7bfad69680e4258518a9b1823e76651c (diff) | |
| download | ruby-df6e577094610d51f0c6891edd2c8663af0c07d6.tar.gz | |
ext/openssl: use SSL_CTX_get_ciphers()
| -rw-r--r-- | ext/openssl/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/openssl/openssl_missing.h | 4 | ||||
| -rw-r--r-- | ext/openssl/ossl_ssl.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 3ab3879c13..556fdb332c 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -138,6 +138,7 @@ have_func("OCSP_SINGLERESP_get0_id") have_func("X509_up_ref") have_func("X509_CRL_up_ref") have_func("X509_STORE_up_ref") +have_func("SSL_CTX_get_ciphers") have_func("SSL_SESSION_up_ref") have_func("EVP_PKEY_up_ref") OpenSSL.check_func_or_macro("SSL_CTX_set_min_proto_version", "openssl/ssl.h") diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index af01e17ef1..0dfcdc51a5 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -160,6 +160,10 @@ void X509_REQ_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg, X509_REQ CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509_STORE); #endif +#if !defined(HAVE_SSL_CTX_GET_CIPHERS) +# define SSL_CTX_get_ciphers(ctx) ((ctx)->cipher_list) +#endif + #if !defined(HAVE_SSL_SESSION_UP_REF) # define SSL_SESSION_up_ref(x) \ CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_SSL_SESSION); diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index 198b1239b6..df7f7e9cca 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -902,7 +902,7 @@ ossl_sslctx_get_ciphers(VALUE self) rb_warning("SSL_CTX is not initialized."); return Qnil; } - ciphers = ctx->cipher_list; + ciphers = SSL_CTX_get_ciphers(ctx); if (!ciphers) return rb_ary_new(); |