From f0bd352429f26f99b7bdacd23baf46b39a9f600a Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 17 Jun 2005 21:15:20 +1000
Subject: [PATCH]  - (dtucker) [cipher.c openbsd-compat/openbsd-compat.h   
 openbsd-compat/openssl-compat.c] only include openssl compat stuff where   
 it's needed as it can cause conflicts elsewhere (eg xcrypt.c).  Found by   
 and ok tim@
 ----------------------------------------------------------------------
 automatically CVS: CVS: Committing in .  CVS: CVS: Modified Files:
 ----------------------------------------------------------------------

---
 ChangeLog                       | 6 +++++-
 cipher.c                        | 3 +++
 openbsd-compat/openbsd-compat.h | 5 +----
 openbsd-compat/openssl-compat.c | 6 ++++--
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f3c3c93ba..3cfba58a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,10 @@
      make this -Wsign-compare clean; ok avsm@ markus@
      NB. auth1.c changes not committed yet (conflicts with uncommitted sync)
      NB2. more work may be needed to make portable Wsign-compare clean
+ - (dtucker) [cipher.c openbsd-compat/openbsd-compat.h
+   openbsd-compat/openssl-compat.c] only include openssl compat stuff where
+   it's needed as it can cause conflicts elsewhere (eg xcrypt.c).  Found by
+   and ok tim@
 
 20050616
  - (djm) OpenBSD CVS Sync
@@ -2734,4 +2738,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3823 2005/06/17 02:59:34 djm Exp $
+$Id: ChangeLog,v 1.3824 2005/06/17 11:15:20 dtucker Exp $
diff --git a/cipher.c b/cipher.c
index 20d0a80c4..fc1e2ae1c 100644
--- a/cipher.c
+++ b/cipher.c
@@ -43,6 +43,9 @@ RCSID("$OpenBSD: cipher.c,v 1.76 2005/06/17 02:44:32 djm Exp $");
 
 #include <openssl/md5.h>
 
+/* compatibility with old or broken OpenSSL versions */
+#include "openbsd-compat/openssl-compat.h"
+
 extern const EVP_CIPHER *evp_ssh1_bf(void);
 extern const EVP_CIPHER *evp_ssh1_3des(void);
 extern void ssh1_3des_iv(EVP_CIPHER_CTX *, int, u_char *, int);
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index f468d5aab..e66f5ec55 100644
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -1,4 +1,4 @@
-/* $Id: openbsd-compat.h,v 1.28 2005/06/09 11:45:11 dtucker Exp $ */
+/* $Id: openbsd-compat.h,v 1.29 2005/06/17 11:15:21 dtucker Exp $ */
 
 /*
  * Copyright (c) 1999-2003 Damien Miller.  All rights reserved.
@@ -168,9 +168,6 @@ char *shadow_pw(struct passwd *pw);
 /* rfc2553 socket API replacements */
 #include "fake-rfc2553.h"
 
-/* compatibility with old or broken OpenSSL versions */
-#include "openssl-compat.h"
-
 /* Routines for a single OS platform */
 #include "bsd-cray.h"
 #include "bsd-cygwin_util.h"
diff --git a/openbsd-compat/openssl-compat.c b/openbsd-compat/openssl-compat.c
index 10b4d1d74..b690e8fe6 100644
--- a/openbsd-compat/openssl-compat.c
+++ b/openbsd-compat/openssl-compat.c
@@ -1,4 +1,4 @@
-/* $Id: openssl-compat.c,v 1.1 2005/06/09 11:45:11 dtucker Exp $ */
+/* $Id: openssl-compat.c,v 1.2 2005/06/17 11:15:21 dtucker Exp $ */
 
 /*
  * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au>
@@ -16,9 +16,11 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define SSH_DONT_REDEF_EVP
 #include "includes.h"
 
+#define SSH_DONT_REDEF_EVP
+#include "openssl-compat.h"
+
 #ifdef SSH_OLD_EVP
 int
 ssh_EVP_CipherInit(EVP_CIPHER_CTX *evp, const EVP_CIPHER *type,