- (dtucker) [cipher-3des1.c cipher-bf1.c] The OpenSSL 0.9.8e problem in

   bug #1291 also affects Protocol 1 3des.  While at it, use compat-openssl.h
   in cipher-bf1.c.  Patch from Juan Gallego.

diff --git a/ChangeLog b/ChangeLog
index 0222c81c3b31a4a5c65645835970c8c68a8c3702..9427d4f74aa9ad0a167feee6145b6019da31ca87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    string.h to prevent warnings, from vapier at gentoo.org.
  - (dtucker) [LICENCE] Add Daniel Walsh as a copyright holder for the
    selinux bits in -portable.
+ - (dtucker) [cipher-3des1.c cipher-bf1.c] The OpenSSL 0.9.8e problem in
+   bug #1291 also affects Protocol 1 3des.  While at it, use compat-openssl.h
+   in cipher-bf1.c.  Patch from Juan Gallego.
 
 20070306
  - (djm) OpenBSD CVS Sync

diff --git a/cipher-3des1.c b/cipher-3des1.c
index fc16e20d7e790762ec7af1e73918e68577d28f0c..17a13a133abbc0dc5de69101edb26eaca95ef020 100644 (file)
--- a/cipher-3des1.c
+++ b/cipher-3des1.c
@@ -35,9 +35,7 @@
 #include "xmalloc.h"
 #include "log.h"
 
-#if OPENSSL_VERSION_NUMBER < 0x00906000L
-#define SSH_OLD_EVP
-#endif
+#include "openbsd-compat/openssl-compat.h"
 
 /*
  * This is used by SSH1:

diff --git a/cipher-bf1.c b/cipher-bf1.c
index 292488c5c61778bb4a1fd15577e40ae5a2c80266..e0e33b4c051158a6c981fcab13ccb9720f514f80 100644 (file)
--- a/cipher-bf1.c
+++ b/cipher-bf1.c
@@ -35,9 +35,7 @@
 #include "xmalloc.h"
 #include "log.h"
 
-#if OPENSSL_VERSION_NUMBER < 0x00906000L
-#define SSH_OLD_EVP
-#endif
+#include "openbsd-compat/openssl-compat.h"
 
 /*
  * SSH1 uses a variation on Blowfish, all bytes must be swapped before