diff options
| author | Damien Miller <djm@mindrot.org> | 2011-08-05 22:17:30 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-08-05 22:17:30 +0200 |
| commit | 20bd4535c01f4a47f535d6e4dc84420a6c5425a5 (patch) | |
| tree | 286fecc890f7799e26b68c08d9f2436b448bbc55 /mac.c | |
| parent | - markus@cvs.openbsd.org 2011/08/01 19:18:15 (diff) | |
| download | openssh-20bd4535c01f4a47f535d6e4dc84420a6c5425a5.tar.xz openssh-20bd4535c01f4a47f535d6e4dc84420a6c5425a5.zip | |
- 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 'mac.c')
| -rw-r--r-- | mac.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: mac.c,v 1.15 2008/06/13 00:51:47 dtucker Exp $ */ +/* $OpenBSD: mac.c,v 1.16 2011/08/02 01:22:11 djm Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -57,6 +57,10 @@ struct { } macs[] = { { "hmac-sha1", SSH_EVP, EVP_sha1, 0, -1, -1 }, { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, -1, -1 }, + { "hmac-sha2-256", SSH_EVP, EVP_sha256, 0, -1, -1 }, + { "hmac-sha2-256-96", SSH_EVP, EVP_sha256, 96, -1, -1 }, + { "hmac-sha2-512", SSH_EVP, EVP_sha512, 0, -1, -1 }, + { "hmac-sha2-512-96", SSH_EVP, EVP_sha512, 96, -1, -1 }, { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 }, { "hmac-md5-96", SSH_EVP, EVP_md5, 96, -1, -1 }, { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, -1, -1 }, |