upstream commit

remove hmac-ripemd160; ok dtucker

Upstream-ID: 896e737ea0bad6e23327d1c127e02d5e9e9c654d

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 @@
-/* $OpenBSD: digest-libc.c,v 1.5 2015/05/05 02:48:17 jsg Exp $ */
+/* $OpenBSD: digest-libc.c,v 1.6 2017/05/08 22:57:38 djm Exp $ */
 /*
  * Copyright (c) 2013 Damien Miller <djm@mindrot.org>
  * Copyright (c) 2014 Markus Friedl.  All rights reserved.
@@ -69,16 +69,6 @@ const struct ssh_digest digests[SSH_DIGEST_MAX] = {
                 (md_final_fn *) MD5Final
         },
         {
-                SSH_DIGEST_RIPEMD160,
-                "RIPEMD160",
-                RMD160_BLOCK_LENGTH,
-                RMD160_DIGEST_LENGTH,
-                sizeof(RMD160_CTX),
-                (md_init_fn *) RMD160Init,
-                (md_update_fn *) RMD160Update,
-                (md_final_fn *) RMD160Final
-        },
-        {
                 SSH_DIGEST_SHA1,
                 "SHA1",
                 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 @@
-/* $OpenBSD: digest-openssl.c,v 1.6 2017/03/10 02:59:51 dtucker Exp $ */
+/* $OpenBSD: digest-openssl.c,v 1.7 2017/05/08 22:57:38 djm Exp $ */
 /*
  * Copyright (c) 2013 Damien Miller <djm@mindrot.org>
  *
@@ -56,7 +56,6 @@ struct ssh_digest {
 /* NB. Indexed directly by algorithm number */
 const struct ssh_digest digests[] = {
         { SSH_DIGEST_MD5,       "MD5",          16,     EVP_md5 },
-        { SSH_DIGEST_RIPEMD160, "RIPEMD160",    20,     EVP_ripemd160 },
         { SSH_DIGEST_SHA1,      "SHA1",         20,     EVP_sha1 },
         { SSH_DIGEST_SHA256,    "SHA256",       32,     EVP_sha256 },
         { 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 @@
-/* $OpenBSD: digest.h,v 1.7 2014/12/21 22:27:56 djm Exp $ */
+/* $OpenBSD: digest.h,v 1.8 2017/05/08 22:57:38 djm Exp $ */
 /*
  * Copyright (c) 2013 Damien Miller <djm@mindrot.org>
  *
@@ -23,12 +23,11 @@
 
 /* Digest algorithms */
 #define SSH_DIGEST_MD5          0
-#define SSH_DIGEST_RIPEMD160    1
-#define SSH_DIGEST_SHA1         2
-#define SSH_DIGEST_SHA256       3
-#define SSH_DIGEST_SHA384       4
-#define SSH_DIGEST_SHA512       5
-#define SSH_DIGEST_MAX          6
+#define SSH_DIGEST_SHA1         1
+#define SSH_DIGEST_SHA256       2
+#define SSH_DIGEST_SHA384       3
+#define SSH_DIGEST_SHA512       4
+#define SSH_DIGEST_MAX          5
 
 struct sshbuf;
 struct 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 @@
-/* $OpenBSD: mac.c,v 1.33 2016/07/08 03:44:42 djm Exp $ */
+/* $OpenBSD: mac.c,v 1.34 2017/05/08 22:57:38 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -64,10 +64,6 @@ static const struct macalg macs[] = {
 #endif
         { "hmac-md5",                           SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 0 },
         { "hmac-md5-96",                        SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 0 },
-#ifdef HAVE_EVP_RIPEMD160
-        { "hmac-ripemd160",                     SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 0 },
-        { "hmac-ripemd160@openssh.com",         SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 0 },
-#endif
         { "umac-64@openssh.com",                SSH_UMAC, 0, 0, 128, 64, 0 },
         { "umac-128@openssh.com",               SSH_UMAC128, 0, 0, 128, 128, 0 },
 
@@ -80,9 +76,6 @@ static const struct macalg macs[] = {
 #endif
         { "hmac-md5-etm@openssh.com",           SSH_DIGEST, SSH_DIGEST_MD5, 0, 0, 0, 1 },
         { "hmac-md5-96-etm@openssh.com",        SSH_DIGEST, SSH_DIGEST_MD5, 96, 0, 0, 1 },
-#ifdef HAVE_EVP_RIPEMD160
-        { "hmac-ripemd160-etm@openssh.com",     SSH_DIGEST, SSH_DIGEST_RIPEMD160, 0, 0, 0, 1 },
-#endif
         { "umac-64-etm@openssh.com",            SSH_UMAC, 0, 0, 128, 64, 1 },
         { "umac-128-etm@openssh.com",           SSH_UMAC128, 0, 0, 128, 128, 1 },