diff options
author | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
commit | c6a2c0334e45419875687d250aed9bea78480f2e (patch) | |
tree | d8f01bef9f3921fa1ca7592a19474be9c8349f76 /mac.c | |
parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) | |
parent | 8b13b5bdc4f19bd52ee673104d66b71c21153b96 (diff) |
merge 6.1p1
Diffstat (limited to 'mac.c')
-rw-r--r-- | mac.c | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mac.c,v 1.17 2011/12/02 00:43:57 djm Exp $ */ | 1 | /* $OpenBSD: mac.c,v 1.18 2012/06/28 05:07:45 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2001 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -61,9 +61,7 @@ struct { | |||
61 | { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, -1, -1 }, | 61 | { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, -1, -1 }, |
62 | #ifdef HAVE_EVP_SHA256 | 62 | #ifdef HAVE_EVP_SHA256 |
63 | { "hmac-sha2-256", SSH_EVP, EVP_sha256, 0, -1, -1 }, | 63 | { "hmac-sha2-256", SSH_EVP, EVP_sha256, 0, -1, -1 }, |
64 | { "hmac-sha2-256-96", SSH_EVP, EVP_sha256, 96, -1, -1 }, | ||
65 | { "hmac-sha2-512", SSH_EVP, EVP_sha512, 0, -1, -1 }, | 64 | { "hmac-sha2-512", SSH_EVP, EVP_sha512, 0, -1, -1 }, |
66 | { "hmac-sha2-512-96", SSH_EVP, EVP_sha512, 96, -1, -1 }, | ||
67 | #endif | 65 | #endif |
68 | { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 }, | 66 | { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 }, |
69 | { "hmac-md5-96", SSH_EVP, EVP_md5, 96, -1, -1 }, | 67 | { "hmac-md5-96", SSH_EVP, EVP_md5, 96, -1, -1 }, |