diff options
| author |   dtucker <dtucker@openbsd.org> | 2012-06-28 05:07:45 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2012-06-28 05:07:45 +0000 |
| commit | 26459ab7cd11662bfe3615a2d509d74f24b1f7c1 (patch) | |
| tree | f8a32bdcd92083b73f042cb4c68b21f9c719b300 /usr.bin/ssh/mac.c | |
| parent | Change sparc64 to match the "fp" boot device path's parameter based on (diff) | |
| download | wireguard-openbsd-26459ab7cd11662bfe3615a2d509d74f24b1f7c1.tar.xz wireguard-openbsd-26459ab7cd11662bfe3615a2d509d74f24b1f7c1.zip | |
Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed
from draft6 of the spec and will not be in the RFC when published. Patch
from mdb at juniper net via bz#2023, ok markus.
Diffstat (limited to 'usr.bin/ssh/mac.c')
| -rw-r--r-- | usr.bin/ssh/mac.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/mac.c b/usr.bin/ssh/mac.c index 1fdad8745e8..da4fdbf6318 100644 --- a/usr.bin/ssh/mac.c +++ b/usr.bin/ssh/mac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mac.c,v 1.17 2011/12/02 00:43:57 djm Exp $ */ +/* $OpenBSD: mac.c,v 1.18 2012/06/28 05:07:45 dtucker Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -55,9 +55,7 @@ struct { { "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 }, |