diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2020-02-20 16:29:59 +0000 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2020-02-21 08:38:48 +0000 |
| commit | bb12a00a481f6e55e6efdfdffb5abb98c7e1f76e (patch) | |
| tree | 2af2c172e3fa3447e4862714cbe12694468e9fea | |
| parent | aed699251906a640d614f01281fd7414028f837c (diff) | |
| download | ruby-openssl-bb12a00a481f6e55e6efdfdffb5abb98c7e1f76e.tar.gz | |
engine: remove really outdated static engines
They no longer exists in OpenSSL 1.0.1, which is the oldest version
Ruby/OpenSSL currently compiles with.
Note that OpenSSL 1.0.2 and older is already in EOL state. The following
engines should also be removed when we completely drop support for those
versions as they were removed in OpenSSL 1.1.0.
- 4758cca
- aep
- atalla
- chil
- cswift
- nuron
- sureware
- ubsec
- gmp
- gost
| -rw-r--r-- | ext/openssl/extconf.rb | 4 | ||||
| -rw-r--r-- | ext/openssl/ossl_engine.c | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 107cc4cf..c16964f7 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -110,8 +110,8 @@ end Logging::message "=== Checking for OpenSSL features... ===\n" # compile options have_func("RAND_egd") -engines = %w{builtin_engines openbsd_dev_crypto dynamic 4758cca aep atalla chil - cswift nuron sureware ubsec padlock capi gmp gost cryptodev aesni} +engines = %w{builtin_engines dynamic 4758cca aep atalla chil + cswift nuron sureware ubsec padlock capi gmp gost cryptodev} engines.each { |name| have_func("ENGINE_load_#{name}()", "openssl/engine.h") } diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c index 5ca0d4ca..075adb62 100644 --- a/ext/openssl/ossl_engine.c +++ b/ext/openssl/ossl_engine.c @@ -147,12 +147,6 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass) #if HAVE_ENGINE_LOAD_CRYPTODEV OSSL_ENGINE_LOAD_IF_MATCH(cryptodev, CRYPTODEV); #endif -#if HAVE_ENGINE_LOAD_AESNI - OSSL_ENGINE_LOAD_IF_MATCH(aesni, AESNI); -#endif -#endif -#ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO - OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto, OPENBSD_DEV_CRYPTO); #endif OSSL_ENGINE_LOAD_IF_MATCH(openssl, OPENSSL); rb_warning("no such builtin loader for `%"PRIsVALUE"'", name); |