- (bal) AES works under Cray, no more hack.

This commit is contained in:
Ben Lindstrom 2001-10-06 00:08:09 +00:00
parent 8bceffb0c3
commit 4c90149c50
2 changed files with 4 additions and 7 deletions

View File

@ -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 $

View File

@ -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," \