summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2017-05-08 22:57:38 +0000
committerDamien Miller <djm@mindrot.org>2017-05-10 11:41:21 +1000
commit7bdb2eeb1d3c26acdc409bd94532eefa252e440b (patch)
tree0e42442f5dae31f7cd1b68bfc4bdfb1018164a04
parent5f02bb1f99f70bb422be8a5c2b77ef853f1db554 (diff)
upstream commit
remove hmac-ripemd160; ok dtucker Upstream-ID: 896e737ea0bad6e23327d1c127e02d5e9e9c654d
-rw-r--r--digest-libc.c12
-rw-r--r--digest-openssl.c3
-rw-r--r--digest.h13
-rw-r--r--mac.c9
4 files changed, 9 insertions, 28 deletions
diff --git a/digest-libc.c b/digest-libc.c
index 40db00274..c2b0b2403 100644
--- a/digest-libc.c
+++ b/digest-libc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: digest-libc.c,v 1.5 2015/05/05 02:48:17 jsg Exp $ */ 1/* $OpenBSD: digest-libc.c,v 1.6 2017/05/08 22:57:38 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2013 Damien Miller <djm@mindrot.org> 3 * Copyright (c) 2013 Damien Miller <djm@mindrot.org>
4 * Copyright (c) 2014 Markus Friedl. All rights reserved. 4 * Copyright (c) 2014 Markus Friedl. All rights reserved.
@@ -69,16 +69,6 @@ const struct ssh_digest digests[SSH_DIGEST_MAX] = {
69 (md_final_fn *) MD5Final 69 (md_final_fn *) MD5Final
70 }, 70 },
71 { 71 {
72 SSH_DIGEST_RIPEMD160,
73 "RIPEMD160",
74 RMD160_BLOCK_LENGTH,
75 RMD160_DIGEST_LENGTH,
76 sizeof(RMD160_CTX),
77 (md_init_fn *) RMD160Init,
78 (md_update_fn *) RMD160Update,
79 (md_final_fn *) RMD160Final
80 },
81 {
82 SSH_DIGEST_SHA1, 72 SSH_DIGEST_SHA1,
83 "SHA1", 73 "SHA1",
84 SHA1_BLOCK_LENGTH, 74 SHA1_BLOCK_LENGTH,
diff --git a/digest-openssl.c b/digest-openssl.c
index c55ceb93f..277099929 100644
--- a/digest-openssl.c
+++ b/digest-openssl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: digest-openssl.c,v 1.6 2017/03/10 02:59:51 dtucker Exp $ */ 1/* $OpenBSD: digest-openssl.c,v 1.7 2017/05/08 22:57:38 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2013 Damien Miller <djm@mindrot.org> 3 * Copyright (c) 2013 Damien Miller <djm@mindrot.org>
4 * 4 *
@@ -56,7 +56,6 @@ struct ssh_digest {
56/* NB. Indexed directly by algorithm number */ 56/* NB. Indexed directly by algorithm number */
57const struct ssh_digest digests[] = { 57const struct ssh_digest digests[] = {
58 { SSH_DIGEST_MD5, "MD5", 16, EVP_md5 }, 58 { SSH_DIGEST_MD5, "MD5", 16, EVP_md5 },
59 { SSH_DIGEST_RIPEMD160, "RIPEMD160", 20, EVP_ripemd160 },
60 { SSH_DIGEST_SHA1, "SHA1", 20, EVP_sha1 }, 59 { SSH_DIGEST_SHA1, "SHA1", 20, EVP_sha1 },
61 { SSH_DIGEST_SHA256, "SHA256", 32, EVP_sha256 }, 60 { SSH_DIGEST_SHA256, "SHA256", 32, EVP_sha256 },
62 { SSH_DIGEST_SHA384, "SHA384", 48, EVP_sha384 }, 61 { SSH_DIGEST_SHA384, "SHA384", 48, EVP_sha384 },
diff --git a/digest.h b/digest.h
index 3fe073468..274574d0e 100644
--- a/digest.h
+++ b/digest.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: digest.h,v 1.7 2014/12/21 22:27:56 djm Exp $ */ 1/* $OpenBSD: digest.h,v 1.8 2017/05/08 22:57:38 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2013 Damien Miller <djm@mindrot.org> 3 * Copyright (c) 2013 Damien Miller <djm@mindrot.org>
4 * 4 *
@@ -23,12 +23,11 @@
23 23
24/* Digest algorithms */ 24/* Digest algorithms */
25#define SSH_DIGEST_MD5 0 25#define SSH_DIGEST_MD5 0
26#define SSH_DIGEST_RIPEMD160 1 26#define SSH_DIGEST_SHA1 1
27#define SSH_DIGEST_SHA1 2 27#define SSH_DIGEST_SHA256 2
28#define SSH_DIGEST_SHA256 3 28#define SSH_DIGEST_SHA384 3
29#define SSH_DIGEST_SHA384 4 29#define SSH_DIGEST_SHA512 4
30#define SSH_DIGEST_SHA512 5 30#define SSH_DIGEST_MAX 5
31#define SSH_DIGEST_MAX 6
32 31
33struct sshbuf; 32struct sshbuf;
34struct ssh_digest_ctx; 33struct ssh_digest_ctx;
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