From 129d0bb6a65dcd9639e841cc3fd2ef3490420d7b Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 19 Dec 2005 17:40:40 +1100
Subject:  - (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@

---
 cipher-ctr.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'cipher-ctr.c')

diff --git a/cipher-ctr.c b/cipher-ctr.c
index 85617734..8a98f3c4 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 $");
 #include "log.h"
 #include "xmalloc.h"
 
-#if OPENSSL_VERSION_NUMBER < 0x00906000L
-#define SSH_OLD_EVP
-#endif
+/* compatibility with old or broken OpenSSL versions */
+#include "openbsd-compat/openssl-compat.h"
 
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
+#ifdef USE_BUILTIN_RIJNDAEL
 #include "rijndael.h"
 #define AES_KEY rijndael_ctx
 #define AES_BLOCK_SIZE 16
-- 
cgit v1.2.3