From 19d32cb9348baec8e86bb4b19de513ff8d7fa3ce Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 29 Jan 2010 10:54:11 +1100 Subject: [PATCH] - (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@. --- ChangeLog | 6 ++++++ openbsd-compat/openssl-compat.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5cd1d8f63..8e427cc41 100644 --- 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 dd326c00f..420496caa 100644 --- a/openbsd-compat/openssl-compat.c +++ b/openbsd-compat/openssl-compat.c @@ -1,4 +1,4 @@ -/* $Id: openssl-compat.c,v 1.8 2009/03/07 11:22:35 dtucker Exp $ */ +/* $Id: openssl-compat.c,v 1.9 2010/01/28 23:54:11 dtucker Exp $ */ /* * Copyright (c) 2005 Darren Tucker @@ -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