diff options
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/myproposal.h b/myproposal.h index b9b819c0a..99d093461 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.29 2012/06/28 05:07:45 dtucker Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.32 2013/01/08 18:49:04 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -73,6 +73,7 @@ | |||
73 | #define KEX_DEFAULT_ENCRYPT \ | 73 | #define KEX_DEFAULT_ENCRYPT \ |
74 | "aes128-ctr,aes192-ctr,aes256-ctr," \ | 74 | "aes128-ctr,aes192-ctr,aes256-ctr," \ |
75 | "arcfour256,arcfour128," \ | 75 | "arcfour256,arcfour128," \ |
76 | "aes128-gcm@openssh.com,aes256-gcm@openssh.com," \ | ||
76 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ | 77 | "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ |
77 | "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" | 78 | "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" |
78 | #ifdef HAVE_EVP_SHA256 | 79 | #ifdef HAVE_EVP_SHA256 |
@@ -83,9 +84,19 @@ | |||
83 | # define SHA2_HMAC_MODES | 84 | # define SHA2_HMAC_MODES |
84 | #endif | 85 | #endif |
85 | #define KEX_DEFAULT_MAC \ | 86 | #define KEX_DEFAULT_MAC \ |
87 | "hmac-md5-etm@openssh.com," \ | ||
88 | "hmac-sha1-etm@openssh.com," \ | ||
89 | "umac-64-etm@openssh.com," \ | ||
90 | "umac-128-etm@openssh.com," \ | ||
91 | "hmac-sha2-256-etm@openssh.com," \ | ||
92 | "hmac-sha2-512-etm@openssh.com," \ | ||
93 | "hmac-ripemd160-etm@openssh.com," \ | ||
94 | "hmac-sha1-96-etm@openssh.com," \ | ||
95 | "hmac-md5-96-etm@openssh.com," \ | ||
86 | "hmac-md5," \ | 96 | "hmac-md5," \ |
87 | "hmac-sha1," \ | 97 | "hmac-sha1," \ |
88 | "umac-64@openssh.com," \ | 98 | "umac-64@openssh.com," \ |
99 | "umac-128@openssh.com," \ | ||
89 | SHA2_HMAC_MODES \ | 100 | SHA2_HMAC_MODES \ |
90 | "hmac-ripemd160," \ | 101 | "hmac-ripemd160," \ |
91 | "hmac-ripemd160@openssh.com," \ | 102 | "hmac-ripemd160@openssh.com," \ |