diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2020-02-21 17:39:16 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 17:39:16 +0900 |
| commit | 3ebae29c4a86376892d1fbc39313ca9a1c873c57 (patch) | |
| tree | cc8860a3c388426563e957ed7402196a1d77043c | |
| parent | 4a7249e83a5095a3910378ba1113b54a52344dbd (diff) | |
| parent | aed699251906a640d614f01281fd7414028f837c (diff) | |
| download | ruby-openssl-3ebae29c4a86376892d1fbc39313ca9a1c873c57.tar.gz | |
Merge pull request #345 from rhenium/ky/engine-load-revert-cloudhsm
engine: revert OpenSSL::Engine.load changes for cloudhsm
| -rw-r--r-- | ext/openssl/extconf.rb | 3 | ||||
| -rw-r--r-- | ext/openssl/ossl_engine.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index f424bf01..107cc4cf 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -111,8 +111,7 @@ 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 - cloudhsm} + cswift nuron sureware ubsec padlock capi gmp gost cryptodev aesni} 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 f90bf061..5ca0d4ca 100644 --- a/ext/openssl/ossl_engine.c +++ b/ext/openssl/ossl_engine.c @@ -150,9 +150,6 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass) #if HAVE_ENGINE_LOAD_AESNI OSSL_ENGINE_LOAD_IF_MATCH(aesni, AESNI); #endif -#if HAVE_ENGINE_LOAD_CLOUDHSM - OSSL_ENGINE_LOAD_IF_MATCH(cloudhsm, CLOUDHSM); -#endif #endif #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto, OPENBSD_DEV_CRYPTO); |