diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2011-09-28 08:14:41 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2011-09-28 08:14:41 +0000 |
| commit | 1e26c29b778d4cac65ea2a83f6089e22fe8f8421 (patch) | |
| tree | 779b14ae51eee4ed5bde82d3600b03a260319632 /myproposal.h | |
| parent | c00cf9e642bae52ddf629123ecd72ca32d6157d8 (diff) | |
| download | src-1e26c29b778d4cac65ea2a83f6089e22fe8f8421.tar.gz src-1e26c29b778d4cac65ea2a83f6089e22fe8f8421.zip | |
Vendor import of OpenSSH 5.9p1vendor/openssh/5.9p1
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=225825
svn path=/vendor-crypto/openssh/5.9p1/; revision=225826; tag=vendor/openssh/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 2c43607a7bd6..0bc1c778c631 100644 --- a/myproposal.h +++ b/myproposal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: myproposal.h,v 1.27 2010/09/01 22:42:13 djm Exp $ */ +/* $OpenBSD: myproposal.h,v 1.28 2011/08/02 01:22:11 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. @@ -75,10 +75,25 @@ "arcfour256,arcfour128," \ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" +#ifdef HAVE_EVP_SHA256 +#define SHA2_HMAC_MODES \ + "hmac-sha2-256," \ + "hmac-sha2-256-96," \ + "hmac-sha2-512," \ + "hmac-sha2-512-96," +#else +# define SHA2_HMAC_MODES +#endif #define KEX_DEFAULT_MAC \ - "hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \ + "hmac-md5," \ + "hmac-sha1," \ + "umac-64@openssh.com," \ + SHA2_HMAC_MODES \ + "hmac-ripemd160," \ "hmac-ripemd160@openssh.com," \ - "hmac-sha1-96,hmac-md5-96" + "hmac-sha1-96," \ + "hmac-md5-96" + #define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib" #define KEX_DEFAULT_LANG "" |