diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /myproposal.h | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/myproposal.h b/myproposal.h index 2c43607a7..0bc1c778c 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. |
@@ -75,10 +75,25 @@ | |||
75 | "arcfour256,arcfour128," \ | 75 | "arcfour256,arcfour128," \ |
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 | #ifdef HAVE_EVP_SHA256 | ||
79 | #define SHA2_HMAC_MODES \ | ||
80 | "hmac-sha2-256," \ | ||
81 | "hmac-sha2-256-96," \ | ||
82 | "hmac-sha2-512," \ | ||
83 | "hmac-sha2-512-96," | ||
84 | #else | ||
85 | # define SHA2_HMAC_MODES | ||
86 | #endif | ||
78 | #define KEX_DEFAULT_MAC \ | 87 | #define KEX_DEFAULT_MAC \ |
79 | "hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \ | 88 | "hmac-md5," \ |
89 | "hmac-sha1," \ | ||
90 | "umac-64@openssh.com," \ | ||
91 | SHA2_HMAC_MODES \ | ||
92 | "hmac-ripemd160," \ | ||
80 | "hmac-ripemd160@openssh.com," \ | 93 | "hmac-ripemd160@openssh.com," \ |
81 | "hmac-sha1-96,hmac-md5-96" | 94 | "hmac-sha1-96," \ |
95 | "hmac-md5-96" | ||
96 | |||
82 | #define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib" | 97 | #define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib" |
83 | #define KEX_DEFAULT_LANG "" | 98 | #define KEX_DEFAULT_LANG "" |
84 | 99 | ||