summaryrefslogtreecommitdiff
path: root/mac.c
diff options
context:
space:
mode:
Diffstat (limited to 'mac.c')
-rw-r--r--mac.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/mac.c b/mac.c
index 5ba7fae19..51dc11d76 100644
--- a/mac.c
+++ b/mac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mac.c,v 1.33 2016/07/08 03:44:42 djm Exp $ */ 1/* $OpenBSD: mac.c,v 1.34 2017/05/08 22:57:38 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2001 Markus Friedl. All rights reserved.
4 * 4 *
@@ -64,10 +64,6 @@ static const struct macalg macs[] = {
64#endif 64#endif
65 { "hmac-md5", SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 0 }, 65 { "hmac-md5", SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 0 },
66 { "hmac-md5-96", SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 0 }, 66 { "hmac-md5-96", SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 0 },
67#ifdef HAVE_EVP_RIPEMD160
68 { "hmac-ripemd160", SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 0 },
69 { "hmac-ripemd160@openssh.com", SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 0 },
70#endif
71 { "umac-64@openssh.com", SSH_UMAC, 0, 0, 128, 64, 0 }, 67 { "umac-64@openssh.com", SSH_UMAC, 0, 0, 128, 64, 0 },
72 { "umac-128@openssh.com", SSH_UMAC128, 0, 0, 128, 128, 0 }, 68 { "umac-128@openssh.com", SSH_UMAC128, 0, 0, 128, 128, 0 },
73 69
@@ -80,9 +76,6 @@ static const struct macalg macs[] = {
80#endif 76#endif
81 { "hmac-md5-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 1 }, 77 { "hmac-md5-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 1 },
82 { "hmac-md5-96-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 1 }, 78 { "hmac-md5-96-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 1 },
83#ifdef HAVE_EVP_RIPEMD160
84 { "hmac-ripemd160-etm@openssh.com", SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 1 },
85#endif
86 { "umac-64-etm@openssh.com", SSH_UMAC, 0, 0, 128, 64, 1 }, 79 { "umac-64-etm@openssh.com", SSH_UMAC, 0, 0, 128, 64, 1 },
87 { "umac-128-etm@openssh.com", SSH_UMAC128, 0, 0, 128, 128, 1 }, 80 { "umac-128-etm@openssh.com", SSH_UMAC128, 0, 0, 128, 128, 1 },
88 81