diff options
| author | rhe <rhe@ruby-lang.org> | 2016-06-05 16:36:39 +0000 |
|---|---|---|
| committer | rhe <rhe@ruby-lang.org> | 2016-06-05 16:36:39 +0000 |
| commit | 8a9f7b57945d81f1f01a915888ff8c32549c4d48 (patch) | |
| tree | 38c222f8adfbd85ca4f7a478f5257981fc60c56f /ext/openssl/extconf.rb | |
| parent | 47698d2292ea0e95a9efbcf54554964258bb5e5a (diff) | |
| download | ruby-openssl-history-8a9f7b57945d81f1f01a915888ff8c32549c4d48.tar.gz | |
openssl: use SSL_is_server()
* ext/openssl/extconf.rb: Check existence of SSL_is_server(). This
function was introduced in OpenSSL 1.0.2.
[ruby-core:75225] [Feature #12324]
* ext/openssl/openssl_missing.h: Implement SSL_is_server() if missing.
* ext/openssl/ossl_ssl.c (ssl_info_cb): Use SSL_is_server() to see if
the SSL is server. The state machine in OpenSSL was rewritten and
SSL_get_state() no longer returns SSL_ST_ACCEPT.
(ossl_ssl_cipher_to_ary, ossl_sslctx_session_get_cb): Add some
`const`s to suppress warning.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/extconf.rb')
| -rw-r--r-- | ext/openssl/extconf.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 8c5dd96..a74774c 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -114,6 +114,7 @@ have_func("SSL_CTX_set_alpn_select_cb") OpenSSL.check_func_or_macro("SSL_CTX_set1_curves_list", "openssl/ssl.h") OpenSSL.check_func_or_macro("SSL_CTX_set_ecdh_auto", "openssl/ssl.h") OpenSSL.check_func_or_macro("SSL_get_server_tmp_key", "openssl/ssl.h") +have_func("SSL_is_server") # added in 1.1.0 have_func("CRYPTO_lock") || $defs.push("-DHAVE_OPENSSL_110_THREADING_API") |