2 files changed, 4 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index a49dd4816..3329de1d9 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.
 
@@ -6635,4 +6638,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1582 2001/10/04 21:16:57 mouring Exp $
+$Id: ChangeLog,v 1.1583 2001/10/06 00:08:09 mouring Exp $
diff --git a/myproposal.h b/myproposal.h
index 2f1cd97ce..4a9a36370 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," \