diff options
| author | djm <djm> | 2011-08-05 20:17:30 +0000 |
|---|---|---|
| committer | djm <djm> | 2011-08-05 20:17:30 +0000 |
| commit | ae366a311e7082a5f1ecbdb9317ddbfc068d1f77 (patch) | |
| tree | 8ad131704e65b8cfdc2c3fd33ae355541cd67c0e /myproposal.h | |
| parent | f855608d136784447a77db232bfc655b93440412 (diff) | |
| download | openssh-ae366a311e7082a5f1ecbdb9317ddbfc068d1f77.tar.gz | |
- djm@cvs.openbsd.org 2011/08/02 01:22:11
[mac.c myproposal.h ssh.1 ssh_config.5 sshd.8 sshd_config.5]
Add new SHA256 and SHA512 based HMAC modes from
http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt
Patch from mdb AT juniper.net; feedback and ok markus@
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 2c43607a..aeb5201d 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. @@ -76,9 +76,18 @@ "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc," \ "aes192-cbc,aes256-cbc,arcfour,rijndael-cbc@lysator.liu.se" #define KEX_DEFAULT_MAC \ - "hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160," \ + "hmac-md5," \ + "hmac-sha1," \ + "umac-64@openssh.com," \ + "hmac-sha2-256," \ + "hmac-sha2-256-96," \ + "hmac-sha2-512," \ + "hmac-sha2-512-96," \ + "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 "" |