- (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 eb4cb36..c664d65 100644
--- 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
@@ -2822,4 +2825,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.4638 2007/03/12 20:37:49 dtucker Exp $
+$Id: ChangeLog,v 1.4639 2007/03/13 07:50:04 dtucker Exp $
diff --git a/cipher-3des1.c b/cipher-3des1.c
index fc16e20..17a13a1 100644
--- 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 292488c..e0e33b4 100644
--- 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