upstream commit

remove hmac-ripemd160; ok dtucker

Upstream-ID: 896e737ea0bad6e23327d1c127e02d5e9e9c654d

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 @@
-/* $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 },