diff options
author | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-03 23:45:23 +0000 |
---|---|---|
committer | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-03 23:45:23 +0000 |
commit | 00bfe1940e10abdf646096aeb4e489f978c91411 (patch) | |
tree | d865db7ac1aa8418272f790ca714bc8ffc486a35 | |
parent | 3e6ea9306c2ef0dbab4f5284c51bb528d9ffee60 (diff) | |
download | ruby-00bfe1940e10abdf646096aeb4e489f978c91411.tar.gz |
* ext/openssl/extconf.rb:
* ext/openssl/ossl_engine.c: add some missing OpenSSL engines.
Thanks, Yui Naruse, for providing the patch!
[Bug #5548] [ruby-core:40670]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ext/openssl/extconf.rb | 7 | ||||
-rw-r--r-- | ext/openssl/ossl_engine.c | 40 |
3 files changed, 43 insertions, 11 deletions
@@ -1,3 +1,10 @@ +Fri Nov 04 08:41:26 2011 Martin Bosslet <Martin.Bosslet@googlemail.com> + + * ext/openssl/extconf.rb: + * ext/openssl/ossl_engine.c: add some missing OpenSSL engines. + Thanks, Yui Naruse, for providing the patch! + [Bug #5548] [ruby-core:40670] + Fri Nov 4 04:54:10 2011 NAKAMURA Usaku <usa@ruby-lang.org> * win32/configure.bat: disable delayed expansion of enironment variable. diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 8d8cee3634..a7872e19a2 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -118,6 +118,7 @@ if have_header("openssl/engine.h") have_func("ENGINE_get_digest") have_func("ENGINE_get_cipher") have_func("ENGINE_cleanup") + have_func("ENGINE_load_dynamic") have_func("ENGINE_load_4758cca") have_func("ENGINE_load_aep") have_func("ENGINE_load_atalla") @@ -126,6 +127,12 @@ if have_header("openssl/engine.h") have_func("ENGINE_load_nuron") have_func("ENGINE_load_sureware") have_func("ENGINE_load_ubsec") + have_func("ENGINE_load_padlock") + have_func("ENGINE_load_capi") + have_func("ENGINE_load_gmp") + have_func("ENGINE_load_gost") + have_func("ENGINE_load_cryptodev") + have_func("ENGINE_load_aesni") end have_func("DH_generate_parameters_ex") have_func("DSA_generate_parameters_ex") diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c index 79f51b8cdb..defc851191 100644 --- a/ext/openssl/ossl_engine.c +++ b/ext/openssl/ossl_engine.c @@ -64,29 +64,47 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass) #if HAVE_ENGINE_LOAD_DYNAMIC OSSL_ENGINE_LOAD_IF_MATCH(dynamic); #endif -#if HAVE_ENGINE_LOAD_CSWIFT - OSSL_ENGINE_LOAD_IF_MATCH(cswift); +#if HAVE_ENGINE_LOAD_4758CCA + OSSL_ENGINE_LOAD_IF_MATCH(4758cca); #endif -#if HAVE_ENGINE_LOAD_CHIL - OSSL_ENGINE_LOAD_IF_MATCH(chil); +#if HAVE_ENGINE_LOAD_AEP + OSSL_ENGINE_LOAD_IF_MATCH(aep); #endif #if HAVE_ENGINE_LOAD_ATALLA OSSL_ENGINE_LOAD_IF_MATCH(atalla); #endif +#if HAVE_ENGINE_LOAD_CHIL + OSSL_ENGINE_LOAD_IF_MATCH(chil); +#endif +#if HAVE_ENGINE_LOAD_CSWIFT + OSSL_ENGINE_LOAD_IF_MATCH(cswift); +#endif #if HAVE_ENGINE_LOAD_NURON OSSL_ENGINE_LOAD_IF_MATCH(nuron); #endif -#if HAVE_ENGINE_LOAD_UBSEC +#if HAVE_ENGINE_LOAD_SUREWARE + OSSL_ENGINE_LOAD_IF_MATCH(sureware); +#endif +#if HAVE_ENGINE_LOAD_UBSEC OSSL_ENGINE_LOAD_IF_MATCH(ubsec); #endif -#if HAVE_ENGINE_LOAD_AEP - OSSL_ENGINE_LOAD_IF_MATCH(aep); +#if HAVE_ENGINE_LOAD_PADLOCK + OSSL_ENGINE_LOAD_IF_MATCH(padlock); #endif -#if HAVE_ENGINE_LOAD_SUREWARE - OSSL_ENGINE_LOAD_IF_MATCH(sureware); +#if HAVE_ENGINE_LOAD_CAPI + OSSL_ENGINE_LOAD_IF_MATCH(capi); #endif -#if HAVE_ENGINE_LOAD_4758CCA - OSSL_ENGINE_LOAD_IF_MATCH(4758cca); +#if HAVE_ENGINE_LOAD_GMP + OSSL_ENGINE_LOAD_IF_MATCH(gmp); +#endif +#if HAVE_ENGINE_LOAD_GOST + OSSL_ENGINE_LOAD_IF_MATCH(gost); +#endif +#if HAVE_ENGINE_LOAD_CRYPTODEV + OSSL_ENGINE_LOAD_IF_MATCH(cryptodev); +#endif +#if HAVE_ENGINE_LOAD_AESNI + OSSL_ENGINE_LOAD_IF_MATCH(aesni); #endif #endif #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO |