emboss	2011-11-04 08:45:23 +0900 (Fri, 04 Nov 2011)

  New Revision: 33631

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33631

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/extconf.rb
    trunk/ext/openssl/ossl_engine.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33630)
+++ ChangeLog	(revision 33631)
@@ -1,3 +1,10 @@
+Fri Nov 04 08:41:26 2011  Martin Bosslet  <Martin.Bosslet@g...>
+
+	* 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@r...>
 
 	* win32/configure.bat: disable delayed expansion of enironment variable.
Index: ext/openssl/ossl_engine.c
===================================================================
--- ext/openssl/ossl_engine.c	(revision 33630)
+++ ext/openssl/ossl_engine.c	(revision 33631)
@@ -64,31 +64,49 @@
 #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
     OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
 #endif
Index: ext/openssl/extconf.rb
===================================================================
--- ext/openssl/extconf.rb	(revision 33630)
+++ ext/openssl/extconf.rb	(revision 33631)
@@ -118,6 +118,7 @@
   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 @@
   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")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/