Consolidate whirlpool

10 files changed, 2 insertions, 17 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 9d29e45..b3c4c52 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -40,7 +40,6 @@ if(HOST_ASM_ELF_X86_64)
                 sha/sha1-elf-x86_64.S
                 sha/sha256-elf-x86_64.S
                 sha/sha512-elf-x86_64.S
-                whrlpool/wp-elf-x86_64.S
                 cpuid-elf-x86_64.S
 
                 bn/arch/amd64/bignum_add.S
@@ -91,7 +90,6 @@ if(HOST_ASM_MACOSX_X86_64)
                 sha/sha1-macosx-x86_64.S
                 sha/sha256-macosx-x86_64.S
                 sha/sha512-macosx-x86_64.S
-                whrlpool/wp-macosx-x86_64.S
                 cpuid-macosx-x86_64.S
 
                 bn/arch/amd64/bignum_add.S
@@ -143,7 +141,6 @@ if(HOST_ASM_MASM_X86_64)
                 sha/sha1-masm-x86_64.S
                 sha/sha256-masm-x86_64.S
                 sha/sha512-masm-x86_64.S
-                whrlpool/wp-masm-x86_64.S
                 cpuid-masm-x86_64.S
         )
         add_definitions(-Dendbr64=)
@@ -182,7 +179,6 @@ if(HOST_ASM_MINGW64_X86_64)
                 sha/sha1-mingw64-x86_64.S
                 sha/sha256-mingw64-x86_64.S
                 sha/sha512-mingw64-x86_64.S
-                whrlpool/wp-mingw64-x86_64.S
                 cpuid-mingw64-x86_64.S
         )
         add_definitions(-Dendbr64=)
@@ -225,7 +221,6 @@ if((NOT HOST_ASM_ELF_X86_64) AND
                 ${CRYPTO_SRC}
                 camellia/camellia.c
                 camellia/cmll_cbc.c
-                whrlpool/wp_block.c
         )
 endif()
 
@@ -625,7 +620,7 @@ set(
         ui/ui_lib.c
         ui/ui_null.c
         ui/ui_util.c
-        whrlpool/wp_dgst.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 0c3192f..31637c0 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -199,7 +199,6 @@ libcrypto_la_CPPFLAGS += -DOPENSSL_NO_ASM
 libcrypto_la_SOURCES += aes/aes_core.c
 libcrypto_la_SOURCES += camellia/camellia.c
 libcrypto_la_SOURCES += camellia/cmll_cbc.c
-libcrypto_la_SOURCES += whrlpool/wp_block.c
 endif
 endif
 endif
@@ -876,8 +875,7 @@ libcrypto_la_SOURCES += ui/ui_util.c
 noinst_HEADERS += ui/ui_local.h
 
 # whrlpool
-libcrypto_la_SOURCES += whrlpool/wp_dgst.c
-noinst_HEADERS += whrlpool/wp_local.h
+libcrypto_la_sources += whrlpool/whirlpool.c
 
 # x509
 libcrypto_la_SOURCES += x509/by_dir.c
diff --git a/crypto/Makefile.am.elf-arm b/crypto/Makefile.am.elf-arm
index 3ff4bc9..c0fc7f8 100644
--- a/crypto/Makefile.am.elf-arm
+++ b/crypto/Makefile.am.elf-arm
@@ -9,7 +9,6 @@ ASM_ARM_ELF += armcap.c
 
 ASM_ARM_ELF += camellia/camellia.c
 ASM_ARM_ELF += camellia/cmll_cbc.c
-ASM_ARM_ELF += whrlpool/wp_block.c
 
 EXTRA_DIST += $(ASM_ARM_ELF)
 
diff --git a/crypto/Makefile.am.elf-mips b/crypto/Makefile.am.elf-mips
index d10e59e..b85bc09 100644
--- a/crypto/Makefile.am.elf-mips
+++ b/crypto/Makefile.am.elf-mips
@@ -7,7 +7,6 @@ ASM_MIPS_ELF += sha/sha256-mips.S
 
 ASM_MIPS_ELF += camellia/camellia.c
 ASM_MIPS_ELF += camellia/cmll_cbc.c
-ASM_MIPS_ELF += whrlpool/wp_block.c
 
 EXTRA_DIST += $(ASM_MIPS_ELF)
 
diff --git a/crypto/Makefile.am.elf-mips64 b/crypto/Makefile.am.elf-mips64
index 1c03584..138ddf7 100644
--- a/crypto/Makefile.am.elf-mips64
+++ b/crypto/Makefile.am.elf-mips64
@@ -7,7 +7,6 @@ ASM_MIPS64_ELF += sha/sha256-mips.S
 
 ASM_MIPS64_ELF += camellia/camellia.c
 ASM_MIPS64_ELF += camellia/cmll_cbc.c
-ASM_MIPS64_ELF += whrlpool/wp_block.c
 
 EXTRA_DIST += $(ASM_MIPS64_ELF)
 
diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64
index 7a4d22c..2303531 100644
--- a/crypto/Makefile.am.elf-x86_64
+++ b/crypto/Makefile.am.elf-x86_64
@@ -13,7 +13,6 @@ ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S
 ASM_X86_64_ELF += sha/sha1-elf-x86_64.S
 ASM_X86_64_ELF += sha/sha256-elf-x86_64.S
 ASM_X86_64_ELF += sha/sha512-elf-x86_64.S
-ASM_X86_64_ELF += whrlpool/wp-elf-x86_64.S
 ASM_X86_64_ELF += cpuid-elf-x86_64.S
 
 ASM_X86_64_ELF += bn/arch/amd64/bignum_add.S
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64
index ad1c39f..53593e2 100644
--- a/crypto/Makefile.am.macosx-x86_64
+++ b/crypto/Makefile.am.macosx-x86_64
@@ -13,7 +13,6 @@ ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S
 ASM_X86_64_MACOSX += sha/sha1-macosx-x86_64.S
 ASM_X86_64_MACOSX += sha/sha256-macosx-x86_64.S
 ASM_X86_64_MACOSX += sha/sha512-macosx-x86_64.S
-ASM_X86_64_MACOSX += whrlpool/wp-macosx-x86_64.S
 ASM_X86_64_MACOSX += cpuid-macosx-x86_64.S
 
 ASM_X86_64_MACOSX += bn/arch/amd64/bignum_add.S
diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64
index 4feacba..af168b2 100644
--- a/crypto/Makefile.am.masm-x86_64
+++ b/crypto/Makefile.am.masm-x86_64
@@ -13,7 +13,6 @@ ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S
 ASM_X86_64_MASM += sha/sha1-masm-x86_64.S
 ASM_X86_64_MASM += sha/sha256-masm-x86_64.S
 ASM_X86_64_MASM += sha/sha512-masm-x86_64.S
-ASM_X86_64_MASM += whrlpool/wp-masm-x86_64.S
 ASM_X86_64_MASM += cpuid-masm-x86_64.S
 
 EXTRA_DIST += $(ASM_X86_64_MASM)
diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64
index 8c430a1..5f95b52 100644
--- a/crypto/Makefile.am.mingw64-x86_64
+++ b/crypto/Makefile.am.mingw64-x86_64
@@ -13,7 +13,6 @@ ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += sha/sha1-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += sha/sha256-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += sha/sha512-mingw64-x86_64.S
-ASM_X86_64_MINGW64 += whrlpool/wp-mingw64-x86_64.S
 ASM_X86_64_MINGW64 += cpuid-mingw64-x86_64.S
 
 EXTRA_DIST += $(ASM_X86_64_MINGW64)
diff --git a/update.sh b/update.sh
index 2976ac4..f4f7785 100755
--- a/update.sh
+++ b/update.sh
@@ -281,7 +281,6 @@ for abi in elf macosx masm mingw64; do
         gen_asm_stdout $abi sha/asm/sha1-x86_64.pl       sha/sha1-$abi-x86_64.S
         gen_asm        $abi sha/asm/sha512-x86_64.pl     sha/sha256-$abi-x86_64.S
         gen_asm        $abi sha/asm/sha512-x86_64.pl     sha/sha512-$abi-x86_64.S
-        gen_asm_stdout $abi whrlpool/asm/wp-x86_64.pl    whrlpool/wp-$abi-x86_64.S
         gen_asm        $abi x86_64cpuid.pl               cpuid-$abi-x86_64.S
 done