diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | openbsd-compat/openssl-compat.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20100129 | ||
2 | - (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config() | ||
3 | after registering the hardware engines, which causes the openssl.cnf file to | ||
4 | be processed. See OpenSSL's man page for OPENSSL_config(3) for details. | ||
5 | Patch from Solomon Peachy, ok djm@. | ||
6 | |||
1 | 20100128 | 7 | 20100128 |
2 | - (djm) OpenBSD CVS Sync | 8 | - (djm) OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2010/01/26 02:15:20 | 9 | - 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 dd326c00f..420496caa 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.c,v 1.8 2009/03/07 11:22:35 dtucker Exp $ */ | 1 | /* $Id: openssl-compat.c,v 1.9 2010/01/28 23:54:11 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> | 4 | * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> |
@@ -67,5 +67,6 @@ ssh_SSLeay_add_all_algorithms(void) | |||
67 | /* Enable use of crypto hardware */ | 67 | /* Enable use of crypto hardware */ |
68 | ENGINE_load_builtin_engines(); | 68 | ENGINE_load_builtin_engines(); |
69 | ENGINE_register_all_complete(); | 69 | ENGINE_register_all_complete(); |
70 | OPENSSL_config(NULL); | ||
70 | } | 71 | } |
71 | #endif | 72 | #endif |