- (dtucker) [includes.h openbsd-compat/openssl-compat.c] Bug #1437: reshuffle

   headers so ./configure --with-ssl-engine actually works.  Patch from
   Ian Lister.

3 files changed, 7 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b2140320..4aa487052 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
  - (dtucker) [configure.ac audit-bsm.c] Bug #1420: Add a local implementation
    of aug_get_machine for systems that don't have their own (eg OS X, FreeBSD).
    Help and testing from csjp at FreeBSD org, vgiffin at apple com.  ok djm@
+ - (dtucker) [includes.h openbsd-compat/openssl-compat.c] Bug #1437: reshuffle
+   headers so ./configure --with-ssl-engine actually works.  Patch from
+   Ian Lister.
 
 20080224
  - (tim) [contrib/cygwin/ssh-host-config]
@@ -3624,4 +3627,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4840 2008/02/25 10:05:04 dtucker Exp $
+$Id: ChangeLog,v 1.4841 2008/02/25 10:13:47 dtucker Exp $
diff --git a/includes.h b/includes.h
index 9fcf1b023..af231a9b3 100644
--- a/includes.h
+++ b/includes.h
@@ -166,6 +166,7 @@
 #include "platform.h"
 #include "openbsd-compat/openbsd-compat.h"
 #include "openbsd-compat/bsd-nextstep.h"
+#include "openbsd-compat/openssl-compat.h"
 
 #include "entropy.h"
 
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index 45ebd3f66..9c9cdb98e 100644
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -1,4 +1,4 @@
-/* $Id: openssl-compat.c,v 1.4 2006/02/22 11:24:47 dtucker Exp $ */
+/* $Id: openssl-compat.c,v 1.5 2008/02/25 10:13:47 dtucker Exp $ */
 
 /*
  * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -16,15 +16,13 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
 #include "includes.h"
 
 #ifdef USE_OPENSSL_ENGINE
 # include <openssl/engine.h>
 #endif
 
-#define SSH_DONT_OVERLOAD_OPENSSL_FUNCS
-#include "openssl-compat.h"
-
 #ifdef SSH_OLD_EVP
 int
 ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type,