diff options
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/myproposal.h b/myproposal.h index 228ed6882..d8cba1caf 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.16 2004/06/13 12:53:24 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.18 2005/07/25 11:59:39 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -28,14 +28,15 @@ | |||
28 | "diffie-hellman-group1-sha1" | 28 | "diffie-hellman-group1-sha1" |
29 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" | 29 | #define KEX_DEFAULT_PK_ALG "ssh-rsa,ssh-dss" |
30 | #define KEX_DEFAULT_ENCRYPT \ | 30 | #define KEX_DEFAULT_ENCRYPT \ |
31 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \ | 31 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ |
32 | "arcfour128,arcfour256,arcfour," \ | ||
32 | "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \ | 33 | "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se," \ |
33 | "aes128-ctr,aes192-ctr,aes256-ctr" | 34 | "aes128-ctr,aes192-ctr,aes256-ctr" |
34 | #define KEX_DEFAULT_MAC \ | 35 | #define KEX_DEFAULT_MAC \ |
35 | "hmac-md5,hmac-sha1,hmac-ripemd160," \ | 36 | "hmac-md5,hmac-sha1,hmac-ripemd160," \ |
36 | "hmac-ripemd160@openssh.com," \ | 37 | "hmac-ripemd160@openssh.com," \ |
37 | "hmac-sha1-96,hmac-md5-96" | 38 | "hmac-sha1-96,hmac-md5-96" |
38 | #define KEX_DEFAULT_COMP "none,zlib" | 39 | #define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib" |
39 | #define KEX_DEFAULT_LANG "" | 40 | #define KEX_DEFAULT_LANG "" |
40 | 41 | ||
41 | 42 | ||