summaryrefslogtreecommitdiff
path: root/cipher-bf1.c
diff options
context:
space:
mode:
authordjm <djm>2003-09-23 12:12:38 +0000
committerdjm <djm>2003-09-23 12:12:38 +0000
commitefb72b1ef3db4b97ccc3937330fb142fb5ddbf4d (patch)
tree4c31850573c0c1c6e3697711efd849559dfedc7d /cipher-bf1.c
parent63ee4aa903e7072870fc69e56bc8382708bfc1e5 (diff)
downloadopenssh-efb72b1ef3db4b97ccc3937330fb142fb5ddbf4d.tar.gz
- (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-bf1.c')
-rw-r--r--cipher-bf1.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/cipher-bf1.c b/cipher-bf1.c
index 64578bae..5af695c1 100644
--- a/cipher-bf1.c
+++ b/cipher-bf1.c
@@ -28,6 +28,11 @@ RCSID("$OpenBSD: cipher-bf1.c,v 1.1 2003/05/15 03:08:29 markus Exp $");
#include <openssl/evp.h>
#include "xmalloc.h"
#include "log.h"
+
+#if OPENSSL_VERSION_NUMBER < 0x00906000L
+#define SSH_OLD_EVP
+#endif
+
/*
* SSH1 uses a variation on Blowfish, all bytes must be swapped before
* and after encryption/decryption. Thus the swap_bytes stuff (yuk).