diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /mac.c | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'mac.c')
-rw-r--r-- | mac.c | 8 |
1 files changed, 7 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,12 @@ 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 | #ifdef HAVE_EVP_SHA256 | ||
61 | { "hmac-sha2-256", SSH_EVP, EVP_sha256, 0, -1, -1 }, | ||
62 | { "hmac-sha2-256-96", SSH_EVP, EVP_sha256, 96, -1, -1 }, | ||
63 | { "hmac-sha2-512", SSH_EVP, EVP_sha512, 0, -1, -1 }, | ||
64 | { "hmac-sha2-512-96", SSH_EVP, EVP_sha512, 96, -1, -1 }, | ||
65 | #endif | ||
60 | { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 }, | 66 | { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 }, |
61 | { "hmac-md5-96", SSH_EVP, EVP_md5, 96, -1, -1 }, | 67 | { "hmac-md5-96", SSH_EVP, EVP_md5, 96, -1, -1 }, |
62 | { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, -1, -1 }, | 68 | { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, -1, -1 }, |