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

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

diff --git a/ChangeLog b/ChangeLog
index fa4df0b76e53447b4ebbac037301eb199befeb8c..8610ad0ec50b49af2bfb1fe8a26dec532f3ad7b7 100644 (file)
--- 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]

diff --git a/includes.h b/includes.h
index 9fcf1b023287c0965f0263086da78085cc666aee..af231a9b3d7bd57347c3b90e805e315fbb6e8e95 100644 (file)
--- 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 564490921ac67e70c426688988f147478072b34d..58faf63bfeee9c787007aa371383763031258340 100644 (file)
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -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,