ruby-changes:15976
From: usa <ko1@a...>
Date: Thu, 20 May 2010 19:12:31 +0900 (JST)
Subject: [ruby-changes:15976] Ruby:r27921 (ruby_1_8): merge from trunk (parts of r27457)
usa 2010-05-20 19:12:18 +0900 (Thu, 20 May 2010) New Revision: 27921 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27921 Log: merge from trunk (parts of r27457) * ext/openssl/extconf.rb: check some functions added at OpenSSL 1.0.0. * ext/openssl/ossl_engine.c (ossl_engine_s_load): use engines which exists. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/ext/openssl/extconf.rb branches/ruby_1_8/ext/openssl/ossl_engine.c Index: ruby_1_8/ext/openssl/ossl_engine.c =================================================================== --- ruby_1_8/ext/openssl/ossl_engine.c (revision 27920) +++ ruby_1_8/ext/openssl/ossl_engine.c (revision 27921) @@ -61,16 +61,34 @@ } StringValue(name); #ifndef OPENSSL_NO_STATIC_ENGINE +#if HAVE_ENGINE_LOAD_DYNAMIC OSSL_ENGINE_LOAD_IF_MATCH(dynamic); +#endif +#if HAVE_ENGINE_LOAD_CSWIFT OSSL_ENGINE_LOAD_IF_MATCH(cswift); +#endif +#if HAVE_ENGINE_LOAD_CHIL OSSL_ENGINE_LOAD_IF_MATCH(chil); +#endif +#if HAVE_ENGINE_LOAD_ATALLA OSSL_ENGINE_LOAD_IF_MATCH(atalla); +#endif +#if HAVE_ENGINE_LOAD_NURON OSSL_ENGINE_LOAD_IF_MATCH(nuron); +#endif +#if HAVE_ENGINE_LOAD_UBSEC OSSL_ENGINE_LOAD_IF_MATCH(ubsec); +#endif +#if HAVE_ENGINE_LOAD_AEP OSSL_ENGINE_LOAD_IF_MATCH(aep); +#endif +#if HAVE_ENGINE_LOAD_SUREWARE OSSL_ENGINE_LOAD_IF_MATCH(sureware); +#endif +#if HAVE_ENGINE_LOAD_4758CCA OSSL_ENGINE_LOAD_IF_MATCH(4758cca); #endif +#endif #ifdef HAVE_ENGINE_LOAD_OPENBSD_DEV_CRYPTO OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto); #endif Index: ruby_1_8/ext/openssl/extconf.rb =================================================================== --- ruby_1_8/ext/openssl/extconf.rb (revision 27920) +++ ruby_1_8/ext/openssl/extconf.rb (revision 27921) @@ -110,6 +110,14 @@ have_func("ENGINE_get_digest") have_func("ENGINE_get_cipher") have_func("ENGINE_cleanup") + have_func("ENGINE_load_4758cca") + have_func("ENGINE_load_aep") + have_func("ENGINE_load_atalla") + have_func("ENGINE_load_chil") + have_func("ENGINE_load_cswift") + have_func("ENGINE_load_nuron") + have_func("ENGINE_load_sureware") + have_func("ENGINE_load_ubsec") end if try_compile(<<SRC) #include <openssl/opensslv.h> Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 27920) +++ ruby_1_8/ChangeLog (revision 27921) @@ -1,3 +1,10 @@ +Thu May 20 19:10:21 2010 NAKAMURA Usaku <usa@r...> + + * ext/openssl/extconf.rb: check some functions added at OpenSSL 1.0.0. + + * ext/openssl/ossl_engine.c (ossl_engine_s_load): use engines which + exists. + Thu May 20 18:54:33 2010 NAKAMURA Usaku <usa@r...> * win32/Makefile.sub (ARCHMINIOBJ): merge miss of r27053. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/