summaryrefslogtreecommitdiff
path: root/mac.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2012-06-30 08:34:59 +1000
committerDamien Miller <djm@mindrot.org>2012-06-30 08:34:59 +1000
commitdb4f8e86184ef0e8d14a370a5569a52d8ed28551 (patch)
treec2664c0607fa20ba11bf3d1f9ce2a1069abd78b2 /mac.c
parent560de922b18fe7fcea8cc837d87cd4609738eb0f (diff)
- dtucker@cvs.openbsd.org 2012/06/28 05:07:45
[mac.c myproposal.h ssh_config.5 sshd_config.5] 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 'mac.c')
-rw-r--r--mac.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mac.c b/mac.c
index 332d3c621..9b450e4e2 100644
--- a/mac.c
+++ b/mac.c
@@ -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 },