diff options
author | Darren Tucker <dtucker@zip.com.au> | 2007-03-13 18:50:04 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2007-03-13 18:50:04 +1100 |
commit | da05f48739c678b88c7e9c071883cd8b5eae5af1 (patch) | |
tree | 1d3ab71c13981e49833ca2ea6119b44a5b0ce5d9 | |
parent | b9fe6a337a31421caeec5ee033a87ab68643efe9 (diff) |
- (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.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | cipher-3des1.c | 4 | ||||
-rw-r--r-- | cipher-bf1.c | 4 |
3 files changed, 6 insertions, 7 deletions
@@ -3,6 +3,9 @@ | |||
3 | string.h to prevent warnings, from vapier at gentoo.org. | 3 | string.h to prevent warnings, from vapier at gentoo.org. |
4 | - (dtucker) [LICENCE] Add Daniel Walsh as a copyright holder for the | 4 | - (dtucker) [LICENCE] Add Daniel Walsh as a copyright holder for the |
5 | selinux bits in -portable. | 5 | selinux bits in -portable. |
6 | - (dtucker) [cipher-3des1.c cipher-bf1.c] The OpenSSL 0.9.8e problem in | ||
7 | bug #1291 also affects Protocol 1 3des. While at it, use compat-openssl.h | ||
8 | in cipher-bf1.c. Patch from Juan Gallego. | ||
6 | 9 | ||
7 | 20070306 | 10 | 20070306 |
8 | - (djm) OpenBSD CVS Sync | 11 | - (djm) OpenBSD CVS Sync |
@@ -2822,4 +2825,4 @@ | |||
2822 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 2825 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
2823 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 2826 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
2824 | 2827 | ||
2825 | $Id: ChangeLog,v 1.4638 2007/03/12 20:37:49 dtucker Exp $ | 2828 | $Id: ChangeLog,v 1.4639 2007/03/13 07:50:04 dtucker Exp $ |
diff --git a/cipher-3des1.c b/cipher-3des1.c index fc16e20d7..17a13a133 100644 --- a/cipher-3des1.c +++ b/cipher-3des1.c | |||
@@ -35,9 +35,7 @@ | |||
35 | #include "xmalloc.h" | 35 | #include "xmalloc.h" |
36 | #include "log.h" | 36 | #include "log.h" |
37 | 37 | ||
38 | #if OPENSSL_VERSION_NUMBER < 0x00906000L | 38 | #include "openbsd-compat/openssl-compat.h" |
39 | #define SSH_OLD_EVP | ||
40 | #endif | ||
41 | 39 | ||
42 | /* | 40 | /* |
43 | * This is used by SSH1: | 41 | * This is used by SSH1: |
diff --git a/cipher-bf1.c b/cipher-bf1.c index 292488c5c..e0e33b4c0 100644 --- a/cipher-bf1.c +++ b/cipher-bf1.c | |||
@@ -35,9 +35,7 @@ | |||
35 | #include "xmalloc.h" | 35 | #include "xmalloc.h" |
36 | #include "log.h" | 36 | #include "log.h" |
37 | 37 | ||
38 | #if OPENSSL_VERSION_NUMBER < 0x00906000L | 38 | #include "openbsd-compat/openssl-compat.h" |
39 | #define SSH_OLD_EVP | ||
40 | #endif | ||
41 | 39 | ||
42 | /* | 40 | /* |
43 | * SSH1 uses a variation on Blowfish, all bytes must be swapped before | 41 | * SSH1 uses a variation on Blowfish, all bytes must be swapped before |