kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

openssl/extconf.rb: NO SSL macros first

Browse source 
* ext/openssl/extconf.rb: check OPENSSL_NO_SSL{2,3} macros before
  checking related functions.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-05-09 00:05:33 +00:00
parent abfc0b18d5
commit e6709f0a62
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ext/openssl/extconf.rb
View file

@ -97,12 +97,16 @@ have_func("OBJ_NAME_do_all_sorted")
have_func("SSL_SESSION_get_id") have_func("SSL_SESSION_get_id")
have_func("SSL_SESSION_cmp") have_func("SSL_SESSION_cmp")
have_func("OPENSSL_cleanse") have_func("OPENSSL_cleanse")
have_func("SSLv2_method") unless have_macro("OPENSSL_NO_SSL2","openssl/opensslconf.h")
have_func("SSLv2_server_method") have_func("SSLv2_method")
have_func("SSLv2_client_method") have_func("SSLv2_server_method")
have_func("SSLv3_method") have_func("SSLv2_client_method")
have_func("SSLv3_server_method") end
have_func("SSLv3_client_method") unless have_macro("OPENSSL_NO_SSL3_METHOD","openssl/opensslconf.h")
have_func("SSLv3_method")
have_func("SSLv3_server_method")
have_func("SSLv3_client_method")
end
have_func("TLSv1_1_method") have_func("TLSv1_1_method")
have_func("TLSv1_1_server_method") have_func("TLSv1_1_server_method")
have_func("TLSv1_1_client_method") have_func("TLSv1_1_client_method")
@ -152,8 +156,6 @@ have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h")
have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h") have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h")
have_macro("OPENSSL_FIPS", ['openssl/opensslconf.h']) && $defs.push("-DHAVE_OPENSSL_FIPS") have_macro("OPENSSL_FIPS", ['openssl/opensslconf.h']) && $defs.push("-DHAVE_OPENSSL_FIPS")
have_macro("EVP_CTRL_GCM_GET_TAG", ['openssl/evp.h']) && $defs.push("-DHAVE_AUTHENTICATED_ENCRYPTION") have_macro("EVP_CTRL_GCM_GET_TAG", ['openssl/evp.h']) && $defs.push("-DHAVE_AUTHENTICATED_ENCRYPTION")
have_macro("OPENSSL_NO_SSL2","openssl/opensslconf.h") && $defs.reject!{|x|/HAVE_SSLV2_/===x}
have_macro("OPENSSL_NO_SSL3_METHOD","openssl/opensslconf.h") && $defs.reject!{|x|/HAVE_SSLV3_/===x}
Logging::message "=== Checking done. ===\n" Logging::message "=== Checking done. ===\n"