From 822593d451e36e8781b6ac007a39452cdbc261b5 Mon Sep 17 00:00:00 2001
From: mouring <mouring>
Date: Sat, 6 Oct 2001 00:08:09 +0000
Subject: [PATCH]  - (bal) AES works under Cray, no more hack.

---
 ChangeLog    | 3 +++
 myproposal.h | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3effb097..0ed39a77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20011005
+ - (bal) AES works under Cray, no more hack. 
+
 20011004
  - (bal) nchan2.ms resync.  BSD License applied.
 
diff --git a/myproposal.h b/myproposal.h
index 2f1cd97c..4a9a3637 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -25,17 +25,11 @@
  */
 #define KEX_DEFAULT_KEX		"diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1"
 #define	KEX_DEFAULT_PK_ALG	"ssh-rsa,ssh-dss"
-#ifdef _CRAY
-/*Temporary hack until rijndael is ported to CRAY word addressable machines  */
-#define	KEX_DEFAULT_ENCRYPT \
-	"3des-cbc,blowfish-cbc,cast128-cbc,arcfour" 
-#else
 #define	KEX_DEFAULT_ENCRYPT \
 	"aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
 	"aes192-cbc,aes256-cbc," \
 	"rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \
 	"rijndael-cbc@lysator.liu.se"
-#endif
 #define	KEX_DEFAULT_MAC \
 	"hmac-md5,hmac-sha1,hmac-ripemd160," \
 	"hmac-ripemd160@openssh.com," \
-- 
2.45.1