- (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config()

   after registering the hardware engines, which causes the openssl.cnf file to
   be processed.  See OpenSSL's man page for OPENSSL_config(3) for details.
   Patch from Solomon Peachy, ok djm@.

diff --git a/ChangeLog b/ChangeLog
index 5cd1d8f634edbee282ebb3d6083f92e9a85749a4..8e427cc41a8bf379d26428dd0aa23a88b5333e25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20100129
+ - (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config()
+   after registering the hardware engines, which causes the openssl.cnf file to
+   be processed.  See OpenSSL's man page for OPENSSL_config(3) for details.
+   Patch from Solomon Peachy, ok djm@.
+
 20100128
  - (djm) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2010/01/26 02:15:20

diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index f50185125bf49b2c634bafc5e72c61c3581ef1a1..022a9313dd5ce46bc5eba7ea90a91687821dc8fe 100644 (file)
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -67,5 +67,6 @@ ssh_SSLeay_add_all_algorithms(void)
        /* Enable use of crypto hardware */
        ENGINE_load_builtin_engines();
        ENGINE_register_all_complete();
+       OPENSSL_config(NULL);
 }
 #endif