summaryrefslogtreecommitdiff
path: root/cipher-aes.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-09-23 22:12:38 +1000
committerDamien Miller <djm@mindrot.org>2003-09-23 22:12:38 +1000
commit5c3a55846a87a40d10aaf08123e4101388d22b87 (patch)
treea45c4d5280d6302b64e7f6565715bb358e62102d /cipher-aes.c
parent7ff4e6dbe588aab63f1547e917734730f388aaa4 (diff)
downloadopenssh-git-5c3a55846a87a40d10aaf08123e4101388d22b87.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-aes.c')
-rw-r--r--cipher-aes.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/cipher-aes.c b/cipher-aes.c
index c41def60..7ba95019 100644
--- a/cipher-aes.c
+++ b/cipher-aes.c
@@ -31,6 +31,10 @@ RCSID("$OpenBSD: cipher-aes.c,v 1.1 2003/05/15 03:08:29 markus Exp $");
#include "xmalloc.h"
#include "log.h"
+#if OPENSSL_VERSION_NUMBER < 0x00906000L
+#define SSH_OLD_EVP
+#endif
+
#define RIJNDAEL_BLOCKSIZE 16
struct ssh_rijndael_ctx
{