From ffeb14a4ac20b80231e7c7895f6657c2439676fc Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Mon, 19 Dec 2005 06:40:40 +0000
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.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cipher.c')

diff --git a/cipher.c b/cipher.c
index 0dddf270..1434d552 100644
--- a/cipher.c
+++ b/cipher.c
@@ -334,7 +334,7 @@ cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len)
 		if ((u_int)evplen != len)
 			fatal("%s: wrong iv length %d != %d", __func__,
 			    evplen, len);
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
+#ifdef USE_BUILTIN_RIJNDAEL
 		if (c->evptype == evp_rijndael)
 			ssh_rijndael_iv(&cc->evp, 0, iv, len);
 		else
@@ -365,7 +365,7 @@ cipher_set_keyiv(CipherContext *cc, u_char *iv)
 		evplen = EVP_CIPHER_CTX_iv_length(&cc->evp);
 		if (evplen == 0)
 			return;
-#if OPENSSL_VERSION_NUMBER < 0x00907000L
+#ifdef USE_BUILTIN_RIJNDAEL
 		if (c->evptype == evp_rijndael)
 			ssh_rijndael_iv(&cc->evp, 1, iv, evplen);
 		else
-- 
cgit v1.2.1