diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-07-22 19:32:00 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-07-22 19:32:00 +0000 |
commit | d9e0824b437bb4d65c1ae564b049e35c93e31010 (patch) | |
tree | bb68047190d2a301312cb928956f1e354ae1915f /myproposal.h | |
parent | 5d629cb65344e14642264a33c9f4019ad609c266 (diff) |
- (bal) Starting the Unicossmk merger. File merged TODO, configure.in,
myproposal.h, ssh_prng_cmds.in, and openbsd-compat/Makefile.in.
Added openbsd-compat/bsd-cray.c. Rest will be merged after
approval. Selective patches from William L. Jones
<jones@mail.utexas.edu>
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/myproposal.h b/myproposal.h index 4a9a36370..2f1cd97ce 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -25,11 +25,17 @@ | |||
25 | */ | 25 | */ |
26 | #define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1" | 26 | #define KEX_DEFAULT_KEX "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1" |
27 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" | 27 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" |
28 | #ifdef _CRAY | ||
29 | /*Temporary hack until rijndael is ported to CRAY word addressable machines */ | ||
30 | #define KEX_DEFAULT_ENCRYPT \ | ||
31 | "3des-cbc,blowfish-cbc,cast128-cbc,arcfour" | ||
32 | #else | ||
28 | #define KEX_DEFAULT_ENCRYPT \ | 33 | #define KEX_DEFAULT_ENCRYPT \ |
29 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ | 34 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ |
30 | "aes192-cbc,aes256-cbc," \ | 35 | "aes192-cbc,aes256-cbc," \ |
31 | "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \ | 36 | "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \ |
32 | "rijndael-cbc@lysator.liu.se" | 37 | "rijndael-cbc@lysator.liu.se" |
38 | #endif | ||
33 | #define KEX_DEFAULT_MAC \ | 39 | #define KEX_DEFAULT_MAC \ |
34 | "hmac-md5,hmac-sha1,hmac-ripemd160," \ | 40 | "hmac-md5,hmac-sha1,hmac-ripemd160," \ |
35 | "hmac-ripemd160@openssh.com," \ | 41 | "hmac-ripemd160@openssh.com," \ |