diff options
author | rhe <rhe@ruby-lang.org> | 2016-05-25 08:46:39 +0000 |
---|---|---|
committer | rhe <rhe@ruby-lang.org> | 2016-05-25 08:46:39 +0000 |
commit | dd0b36eb2166a48b9d990dbdd019f7027c62788c (patch) | |
tree | 2880c8ad454d4bcc95d4eed3607f471869098101 /ext/openssl/extconf.rb | |
parent | 96f3a47df6ae6df9c95b28bed9548db1d26d8cf5 (diff) | |
download | ruby-openssl-history-dd0b36eb2166a48b9d990dbdd019f7027c62788c.tar.gz |
openssl: remove check of OPENSSL_FIPS macro in extconf.rb
* ext/openssl/extconf.rb: Remove check of OPENSSL_FIPS macro. This is
unneeded because we can check the macro directly in source code,
just as we already do for OPENSSL_NO_* macros.
* ext/openssl/ossl.c: Replace occurrences of HAVE_OPENSSL_FIPS with
OPENSSL_FIPS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/extconf.rb')
-rw-r--r-- | ext/openssl/extconf.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 9b3bdef..39543f3 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -154,7 +154,6 @@ have_struct_member("CRYPTO_THREADID", "ptr", "openssl/crypto.h") have_struct_member("EVP_CIPHER_CTX", "flags", "openssl/evp.h") have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h") have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h") -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") Logging::message "=== Checking done. ===\n" |