diff options
| author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
| commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
| tree | 28fc9a13eaab935e4de055b561b333d67387a934 /cipher-ctr.c | |
| parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
| parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) | |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'cipher-ctr.c')
| -rw-r--r-- | cipher-ctr.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cipher-ctr.c b/cipher-ctr.c index 856177349..8a98f3c42 100644 --- a/cipher-ctr.c +++ b/cipher-ctr.c | |||
| @@ -21,11 +21,10 @@ RCSID("$OpenBSD: cipher-ctr.c,v 1.6 2005/07/17 07:17:55 djm Exp $"); | |||
| 21 | #include "log.h" | 21 | #include "log.h" |
| 22 | #include "xmalloc.h" | 22 | #include "xmalloc.h" |
| 23 | 23 | ||
| 24 | #if OPENSSL_VERSION_NUMBER < 0x00906000L | 24 | /* compatibility with old or broken OpenSSL versions */ |
| 25 | #define SSH_OLD_EVP | 25 | #include "openbsd-compat/openssl-compat.h" |
| 26 | #endif | ||
| 27 | 26 | ||
| 28 | #if OPENSSL_VERSION_NUMBER < 0x00907000L | 27 | #ifdef USE_BUILTIN_RIJNDAEL |
| 29 | #include "rijndael.h" | 28 | #include "rijndael.h" |
| 30 | #define AES_KEY rijndael_ctx | 29 | #define AES_KEY rijndael_ctx |
| 31 | #define AES_BLOCK_SIZE 16 | 30 | #define AES_BLOCK_SIZE 16 |