diff options
| author |   djm <djm@openbsd.org> | 2011-08-02 01:22:11 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2011-08-02 01:22:11 +0000 |
| commit | 9fd848c718d94e9a3925ea22606bf7f6b7d32dd9 (patch) | |
| tree | d20e17f6aa93a5353c0caf7b63f1e0d0441e3e2b /usr.bin/ssh/mac.c | |
| parent | stop using the word 'firmwares' (diff) | |
| download | wireguard-openbsd-9fd848c718d94e9a3925ea22606bf7f6b7d32dd9.tar.xz wireguard-openbsd-9fd848c718d94e9a3925ea22606bf7f6b7d32dd9.zip | |
Add new SHA256 and SHA512 based HMAC modes from
http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt
feedback and ok markus@
Diffstat (limited to 'usr.bin/ssh/mac.c')
| -rw-r--r-- | usr.bin/ssh/mac.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/ssh/mac.c b/usr.bin/ssh/mac.c index de6f69512ba..252f8bf1a9e 100644 --- a/usr.bin/ssh/mac.c +++ b/usr.bin/ssh/mac.c @@ -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. * @@ -54,6 +54,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 }, |