diff options
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/myproposal.h b/myproposal.h index 2c43607a7..aeb5201dc 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.27 2010/09/01 22:42:13 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.28 2011/08/02 01:22:11 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -76,9 +76,18 @@ | |||
76 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ | 76 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ |
77 | "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" | 77 | "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" |
78 | #define KEX_DEFAULT_MAC \ | 78 | #define KEX_DEFAULT_MAC \ |
79 | "hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \ | 79 | "hmac-md5," \ |
80 | "hmac-sha1," \ | ||
81 | "umac-64@openssh.com," \ | ||
82 | "hmac-sha2-256," \ | ||
83 | "hmac-sha2-256-96," \ | ||
84 | "hmac-sha2-512," \ | ||
85 | "hmac-sha2-512-96," \ | ||
86 | "hmac-ripemd160," \ | ||
80 | "hmac-ripemd160@openssh.com," \ | 87 | "hmac-ripemd160@openssh.com," \ |
81 | "hmac-sha1-96,hmac-md5-96" | 88 | "hmac-sha1-96," \ |
89 | "hmac-md5-96" | ||
90 | |||
82 | #define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib" | 91 | #define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib" |
83 | #define KEX_DEFAULT_LANG "" | 92 | #define KEX_DEFAULT_LANG "" |
84 | 93 | ||