diff options
author | Damien Miller <djm@mindrot.org> | 2011-08-06 06:17:30 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-08-06 06:17:30 +1000 |
commit | 20bd4535c01f4a47f535d6e4dc84420a6c5425a5 (patch) | |
tree | 286fecc890f7799e26b68c08d9f2436b448bbc55 /mac.c | |
parent | adb467fb692600c569d8129dfd96371b481d2653 (diff) |
- 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 @@ | |||
1 | /* $OpenBSD: mac.c,v 1.15 2008/06/13 00:51:47 dtucker Exp $ */ | 1 | /* $OpenBSD: mac.c,v 1.16 2011/08/02 01:22:11 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -57,6 +57,10 @@ struct { | |||
57 | } macs[] = { | 57 | } macs[] = { |
58 | { "hmac-sha1", SSH_EVP, EVP_sha1, 0, -1, -1 }, | 58 | { "hmac-sha1", SSH_EVP, EVP_sha1, 0, -1, -1 }, |
59 | { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, -1, -1 }, | 59 | { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, -1, -1 }, |
60 | { "hmac-sha2-256", SSH_EVP, EVP_sha256, 0, -1, -1 }, | ||
61 | { "hmac-sha2-256-96", SSH_EVP, EVP_sha256, 96, -1, -1 }, | ||
62 | { "hmac-sha2-512", SSH_EVP, EVP_sha512, 0, -1, -1 }, | ||
63 | { "hmac-sha2-512-96", SSH_EVP, EVP_sha512, 96, -1, -1 }, | ||
60 | { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 }, | 64 | { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 }, |
61 | { "hmac-md5-96", SSH_EVP, EVP_md5, 96, -1, -1 }, | 65 | { "hmac-md5-96", SSH_EVP, EVP_md5, 96, -1, -1 }, |
62 | { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, -1, -1 }, | 66 | { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, -1, -1 }, |