Adjust for whirlpool removal

5 files changed, 2 insertions, 19 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 38b94fa..8500d32 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -456,7 +456,6 @@ set(
         evp/m_sha3.c
         evp/m_sigver.c
         evp/m_sm3.c
-        evp/m_wp.c
         evp/p_legacy.c
         evp/p_lib.c
         evp/p_sign.c
@@ -580,7 +579,6 @@ set(
         ui/ui_lib.c
         ui/ui_null.c
         ui/ui_util.c
-        whrlpool/whirlpool.c
         x509/by_dir.c
         x509/by_file.c
         x509/by_mem.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 7b46206..05a2246 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -623,7 +623,6 @@ libcrypto_la_SOURCES += evp/m_sha1.c
 libcrypto_la_SOURCES += evp/m_sha3.c
 libcrypto_la_SOURCES += evp/m_sigver.c
 libcrypto_la_SOURCES += evp/m_sm3.c
-libcrypto_la_SOURCES += evp/m_wp.c
 libcrypto_la_SOURCES += evp/p_legacy.c
 libcrypto_la_SOURCES += evp/p_lib.c
 libcrypto_la_SOURCES += evp/p_sign.c
@@ -685,7 +684,6 @@ noinst_HEADERS += hidden/openssl/stack.h
 noinst_HEADERS += hidden/openssl/ts.h
 noinst_HEADERS += hidden/openssl/txt_db.h
 noinst_HEADERS += hidden/openssl/ui.h
-noinst_HEADERS += hidden/openssl/whrlpool.h
 noinst_HEADERS += hidden/openssl/x509.h
 noinst_HEADERS += hidden/openssl/x509_vfy.h
 noinst_HEADERS += hidden/openssl/x509v3.h
@@ -878,9 +876,6 @@ endif
 libcrypto_la_SOURCES += ui/ui_util.c
 noinst_HEADERS += ui/ui_local.h
 
-# whrlpool
-libcrypto_la_SOURCES += whrlpool/whirlpool.c
-
 # x509
 libcrypto_la_SOURCES += x509/by_dir.c
 libcrypto_la_SOURCES += x509/by_file.c
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 61de671..8f647b1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -851,11 +851,6 @@ add_executable(verifytest verifytest.c)
 target_link_libraries(verifytest ${LIBTLS_TEST_LIBS})
 add_platform_test(verifytest verifytest)
 
-# whirlpool_test
-add_executable(whirlpool_test whirlpool_test.c)
-target_link_libraries(whirlpool_test ${OPENSSL_TEST_LIBS})
-add_platform_test(whirlpool_test whirlpool_test)
-
 # x25519test
 add_executable(x25519test x25519test.c)
 target_link_libraries(x25519test ${OPENSSL_TEST_LIBS})
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a1b89b7..604fdab 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -831,11 +831,6 @@ TESTS += verifytest
 check_PROGRAMS += verifytest
 verifytest_SOURCES = verifytest.c
 
-# whirlpool
-TESTS += whirlpool_test
-check_PROGRAMS += whirlpool_test
-whirlpool_test_SOURCES = whirlpool_test.c
-
 # x25519test
 TESTS += x25519test
 check_PROGRAMS += x25519test
diff --git a/update.sh b/update.sh
index cbf01c9..2948e0f 100755
--- a/update.sh
+++ b/update.sh
@@ -132,9 +132,9 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
         hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h
         x509/x509v3.h conf/conf.h ocsp/ocsp.h
         aes/aes.h modes/modes.h asn1/asn1t.h bf/blowfish.h
-        bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h conf/conf_api.h des/des.h dh/dh.h
+        bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h des/des.h dh/dh.h
         dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h
-        md4/md4.h ripemd/ripemd.h whrlpool/whrlpool.h idea/idea.h
+        md4/md4.h ripemd/ripemd.h idea/idea.h
         rc2/rc2.h rc4/rc4.h txt_db/txt_db.h
         sm3/sm3.h sm4/sm4.h chacha/chacha.h evp/evp.h poly1305/poly1305.h
         camellia/camellia.h curve25519/curve25519.h