summaryrefslogtreecommitdiff
path: root/cipher-ctr.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-12-19 17:40:40 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-12-19 17:40:40 +1100
commit129d0bb6a65dcd9639e841cc3fd2ef3490420d7b (patch)
treea56f568a753739143c8662390e8cf6d8f2f34025 /cipher-ctr.c
parentd40c66cf3f5d7713ea9489778dc450a48984a81d (diff)
- (dtucker) [cipher-aes.c cipher-ctr.c cipher.c configure.ac
openbsd-compat/openssl-compat.h] Check for and work around broken AES ciphers >128bit on (some) Solaris 10 systems. ok djm@
Diffstat (limited to 'cipher-ctr.c')
-rw-r--r--cipher-ctr.c7
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