diff options
author | Damien Miller <djm@mindrot.org> | 2003-09-23 22:12:38 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-09-23 22:12:38 +1000 |
commit | 5c3a55846a87a40d10aaf08123e4101388d22b87 (patch) | |
tree | a45c4d5280d6302b64e7f6565715bb358e62102d /cipher-3des1.c | |
parent | 7ff4e6dbe588aab63f1547e917734730f388aaa4 (diff) |
- (djm) Sync with V_3_7 branch:
- (djm) Fix SSH1 challenge kludge
- (djm) Bug #671: Fix builds on OpenBSD
- (djm) Bug #676: Fix PAM stack corruption
- (djm) Fix bad free() in PAM code
- (djm) Don't call pam_end before pam_init
- (djm) Enable build with old OpenSSL again
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
Diffstat (limited to 'cipher-3des1.c')
-rw-r--r-- | cipher-3des1.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cipher-3des1.c b/cipher-3des1.c index f9a352397..6f9f5dd6b 100644 --- a/cipher-3des1.c +++ b/cipher-3des1.c | |||
@@ -29,6 +29,10 @@ RCSID("$OpenBSD: cipher-3des1.c,v 1.1 2003/05/15 03:08:29 markus Exp $"); | |||
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
30 | #include "log.h" | 30 | #include "log.h" |
31 | 31 | ||
32 | #if OPENSSL_VERSION_NUMBER < 0x00906000L | ||
33 | #define SSH_OLD_EVP | ||
34 | #endif | ||
35 | |||
32 | /* | 36 | /* |
33 | * This is used by SSH1: | 37 | * This is used by SSH1: |
34 | * | 38 | * |