diff options
| author | mouring <mouring> | 2001-10-06 00:08:09 +0000 |
|---|---|---|
| committer | mouring <mouring> | 2001-10-06 00:08:09 +0000 |
| commit | 63b1efe61af831517a982a8f127bfd0887af1235 (patch) | |
| tree | eda5c1c1116209d19b466919a79ee92ec0269dd4 | |
| parent | aecbf06f06d1cee41c8962345a27db38e77e32d2 (diff) | |
| download | openssh-63b1efe61af831517a982a8f127bfd0887af1235.tar.gz | |
- (bal) AES works under Cray, no more hack.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | myproposal.h | 6 |
2 files changed, 4 insertions, 7 deletions
@@ -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 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," \ |