Skip to content

Commit

Permalink
Remove configure test & compat code for ripemd160.
Browse files Browse the repository at this point in the history
RIPEMD160 support was removed upstream in 2017, however we still had
a configure test and compat code for it, so clean those up now.
  • Loading branch information
daztucker committed Jan 14, 2020
1 parent ed3ad71 commit 26b2675
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 459 deletions.
9 changes: 0 additions & 9 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2915,15 +2915,6 @@ if test "x$openssl" = "xyes" ; then
# Check for SHA256, SHA384 and SHA512 support in OpenSSL
AC_CHECK_FUNCS([EVP_sha256 EVP_sha384 EVP_sha512])

# Search for RIPE-MD support in OpenSSL
AC_CHECK_FUNCS([EVP_ripemd160], ,
[unsupported_algorithms="$unsupported_algorithms \
hmac-ripemd160 \
hmac-ripemd160@openssh.com \
hmac-ripemd160-etm@openssh.com"
]
)

# Check complete ECC support in OpenSSL
AC_MSG_CHECKING([whether OpenSSL has NID_X9_62_prime256v1])
AC_LINK_IFELSE(
Expand Down
3 changes: 0 additions & 3 deletions digest-openssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
#include "digest.h"
#include "ssherr.h"

#ifndef HAVE_EVP_RIPEMD160
# define EVP_ripemd160 NULL
#endif
#ifndef HAVE_EVP_SHA256
# define EVP_sha256 NULL
#endif
Expand Down
1 change: 0 additions & 1 deletion openbsd-compat/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ OPENBSD=base64.o \
readpassphrase.o \
reallocarray.o \
recallocarray.o \
rmd160.o \
rresvport.o \
setenv.o \
setproctitle.o \
Expand Down
1 change: 0 additions & 1 deletion openbsd-compat/openbsd-compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
#include "getrrsetbyname.h"
#include "sha1.h"
#include "sha2.h"
#include "rmd160.h"
#include "md5.h"
#include "blf.h"
#include "fnmatch.h"
Expand Down
6 changes: 0 additions & 6 deletions openbsd-compat/openssl-compat.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,6 @@ void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t);
# endif
#endif

#if defined(HAVE_EVP_RIPEMD160)
# if defined(OPENSSL_NO_RIPEMD) || defined(OPENSSL_NO_RMD160)
# undef HAVE_EVP_RIPEMD160
# endif
#endif

/* LibreSSL/OpenSSL 1.1x API compat */
#ifndef HAVE_DSA_GET0_PQG
void DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q,
Expand Down
Loading

0 comments on commit 26b2675

Please sign in to comment.