From 70d384d5371c95ff84c79fa7cb6fa31a744dd9b3 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Fri, 29 Mar 2024 01:45:13 -0600 Subject: camellia/cast consolidation coping --- crypto/CMakeLists.txt | 28 ++-------------------------- crypto/Makefile.am | 16 ++-------------- crypto/Makefile.am.elf-arm | 3 --- crypto/Makefile.am.elf-mips | 3 --- crypto/Makefile.am.elf-mips64 | 3 --- crypto/Makefile.am.elf-x86_64 | 1 - crypto/Makefile.am.macosx-x86_64 | 1 - crypto/Makefile.am.masm-x86_64 | 1 - crypto/Makefile.am.mingw64-x86_64 | 1 - update.sh | 1 - 10 files changed, 4 insertions(+), 54 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 4c50bc3..c0c05f2 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -33,7 +33,6 @@ if(HOST_ASM_ELF_X86_64) bn/modexp512-elf-x86_64.S bn/mont-elf-x86_64.S bn/mont5-elf-x86_64.S - camellia/cmll-elf-x86_64.S md5/md5-elf-x86_64.S modes/ghash-elf-x86_64.S rc4/rc4-elf-x86_64.S @@ -83,7 +82,6 @@ if(HOST_ASM_MACOSX_X86_64) bn/modexp512-macosx-x86_64.S bn/mont-macosx-x86_64.S bn/mont5-macosx-x86_64.S - camellia/cmll-macosx-x86_64.S md5/md5-macosx-x86_64.S modes/ghash-macosx-x86_64.S rc4/rc4-macosx-x86_64.S @@ -134,7 +132,6 @@ if(HOST_ASM_MASM_X86_64) #bn/modexp512-masm-x86_64.S #bn/mont-masm-x86_64.S #bn/mont5-masm-x86_64.S - camellia/cmll-masm-x86_64.S md5/md5-masm-x86_64.S modes/ghash-masm-x86_64.S rc4/rc4-masm-x86_64.S @@ -172,7 +169,6 @@ if(HOST_ASM_MINGW64_X86_64) #bn/modexp512-mingw64-x86_64.S #bn/mont-mingw64-x86_64.S #bn/mont5-mingw64-x86_64.S - camellia/cmll-mingw64-x86_64.S md5/md5-mingw64-x86_64.S modes/ghash-mingw64-x86_64.S rc4/rc4-mingw64-x86_64.S @@ -200,18 +196,6 @@ if(HOST_ASM_MINGW64_X86_64) set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C) endif() -if((NOT HOST_ASM_ELF_X86_64) AND - (NOT HOST_ASM_MACOSX_X86_64) AND - (NOT HOST_ASM_MASM_X86_64) AND - (NOT HOST_ASM_MINGW64_X86_64)) - set( - CRYPTO_SRC - ${CRYPTO_SRC} - camellia/camellia.c - camellia/cmll_cbc.c - ) -endif() - set( CRYPTO_SRC ${CRYPTO_SRC} @@ -338,16 +322,8 @@ set( bytestring/bs_ber.c bytestring/bs_cbb.c bytestring/bs_cbs.c - camellia/cmll_cfb.c - camellia/cmll_ctr.c - camellia/cmll_ecb.c - camellia/cmll_misc.c - camellia/cmll_ofb.c - cast/c_cfb64.c - cast/c_ecb.c - cast/c_enc.c - cast/c_ofb64.c - cast/c_skey.c + camellia/camellia.c + cast/cast.c chacha/chacha.c cmac/cm_ameth.c cmac/cm_pmeth.c diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 9e8b5e6..cd03c7d 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -196,8 +196,6 @@ if !HOST_ASM_MACOSX_X86_64 if !HOST_ASM_MASM_X86_64 if !HOST_ASM_MINGW64_X86_64 libcrypto_la_CPPFLAGS += -DOPENSSL_NO_ASM -libcrypto_la_SOURCES += camellia/camellia.c -libcrypto_la_SOURCES += camellia/cmll_cbc.c endif endif endif @@ -427,22 +425,12 @@ libcrypto_la_SOURCES += bytestring/bs_cbb.c libcrypto_la_SOURCES += bytestring/bs_cbs.c # camellia -libcrypto_la_SOURCES += camellia/cmll_cfb.c -libcrypto_la_SOURCES += camellia/cmll_ctr.c -libcrypto_la_SOURCES += camellia/cmll_ecb.c -libcrypto_la_SOURCES += camellia/cmll_misc.c -libcrypto_la_SOURCES += camellia/cmll_ofb.c +libcrypto_la_SOURCES += camellia/camellia.c noinst_HEADERS += camellia/camellia.h -noinst_HEADERS += camellia/cmll_local.h # cast -libcrypto_la_SOURCES += cast/c_cfb64.c -libcrypto_la_SOURCES += cast/c_ecb.c -libcrypto_la_SOURCES += cast/c_enc.c -libcrypto_la_SOURCES += cast/c_ofb64.c -libcrypto_la_SOURCES += cast/c_skey.c +libcrypto_la_SOURCES += cast/cast.c noinst_HEADERS += cast/cast_local.h -noinst_HEADERS += cast/cast_s.h # chacha EXTRA_libcrypto_la_SOURCES += chacha/chacha-merged.c diff --git a/crypto/Makefile.am.elf-arm b/crypto/Makefile.am.elf-arm index c0fc7f8..4f88994 100644 --- a/crypto/Makefile.am.elf-arm +++ b/crypto/Makefile.am.elf-arm @@ -7,9 +7,6 @@ ASM_ARM_ELF += modes/ghash-elf-armv4.S ASM_ARM_ELF += armv4cpuid.S ASM_ARM_ELF += armcap.c -ASM_ARM_ELF += camellia/camellia.c -ASM_ARM_ELF += camellia/cmll_cbc.c - EXTRA_DIST += $(ASM_ARM_ELF) if HOST_ASM_ELF_ARM diff --git a/crypto/Makefile.am.elf-mips b/crypto/Makefile.am.elf-mips index b85bc09..ea0a730 100644 --- a/crypto/Makefile.am.elf-mips +++ b/crypto/Makefile.am.elf-mips @@ -5,9 +5,6 @@ ASM_MIPS_ELF += sha/sha1-mips.S ASM_MIPS_ELF += sha/sha512-mips.S ASM_MIPS_ELF += sha/sha256-mips.S -ASM_MIPS_ELF += camellia/camellia.c -ASM_MIPS_ELF += camellia/cmll_cbc.c - EXTRA_DIST += $(ASM_MIPS_ELF) if HOST_ASM_ELF_MIPS diff --git a/crypto/Makefile.am.elf-mips64 b/crypto/Makefile.am.elf-mips64 index 138ddf7..8f851f3 100644 --- a/crypto/Makefile.am.elf-mips64 +++ b/crypto/Makefile.am.elf-mips64 @@ -5,9 +5,6 @@ ASM_MIPS64_ELF += sha/sha1-mips.S ASM_MIPS64_ELF += sha/sha512-mips.S ASM_MIPS64_ELF += sha/sha256-mips.S -ASM_MIPS64_ELF += camellia/camellia.c -ASM_MIPS64_ELF += camellia/cmll_cbc.c - EXTRA_DIST += $(ASM_MIPS64_ELF) if HOST_ASM_ELF_MIPS64 diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64 index 2303531..990475e 100644 --- a/crypto/Makefile.am.elf-x86_64 +++ b/crypto/Makefile.am.elf-x86_64 @@ -6,7 +6,6 @@ ASM_X86_64_ELF += aes/aesni-elf-x86_64.S ASM_X86_64_ELF += bn/modexp512-elf-x86_64.S ASM_X86_64_ELF += bn/mont-elf-x86_64.S ASM_X86_64_ELF += bn/mont5-elf-x86_64.S -ASM_X86_64_ELF += camellia/cmll-elf-x86_64.S ASM_X86_64_ELF += md5/md5-elf-x86_64.S ASM_X86_64_ELF += modes/ghash-elf-x86_64.S ASM_X86_64_ELF += rc4/rc4-elf-x86_64.S diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64 index 53593e2..c380003 100644 --- a/crypto/Makefile.am.macosx-x86_64 +++ b/crypto/Makefile.am.macosx-x86_64 @@ -6,7 +6,6 @@ ASM_X86_64_MACOSX += aes/aesni-macosx-x86_64.S ASM_X86_64_MACOSX += bn/modexp512-macosx-x86_64.S ASM_X86_64_MACOSX += bn/mont-macosx-x86_64.S ASM_X86_64_MACOSX += bn/mont5-macosx-x86_64.S -ASM_X86_64_MACOSX += camellia/cmll-macosx-x86_64.S ASM_X86_64_MACOSX += md5/md5-macosx-x86_64.S ASM_X86_64_MACOSX += modes/ghash-macosx-x86_64.S ASM_X86_64_MACOSX += rc4/rc4-macosx-x86_64.S diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64 index af168b2..437638c 100644 --- a/crypto/Makefile.am.masm-x86_64 +++ b/crypto/Makefile.am.masm-x86_64 @@ -6,7 +6,6 @@ ASM_X86_64_MASM += aes/aesni-masm-x86_64.S ASM_X86_64_MASM += bn/modexp512-masm-x86_64.S ASM_X86_64_MASM += bn/mont-masm-x86_64.S ASM_X86_64_MASM += bn/mont5-masm-x86_64.S -ASM_X86_64_MASM += camellia/cmll-masm-x86_64.S ASM_X86_64_MASM += md5/md5-masm-x86_64.S ASM_X86_64_MASM += modes/ghash-masm-x86_64.S ASM_X86_64_MASM += rc4/rc4-masm-x86_64.S diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64 index 5f95b52..90a58d2 100644 --- a/crypto/Makefile.am.mingw64-x86_64 +++ b/crypto/Makefile.am.mingw64-x86_64 @@ -6,7 +6,6 @@ ASM_X86_64_MINGW64 += aes/aesni-mingw64-x86_64.S #ASM_X86_64_MINGW64 += bn/modexp512-mingw64-x86_64.S #ASM_X86_64_MINGW64 += bn/mont-mingw64-x86_64.S #ASM_X86_64_MINGW64 += bn/mont5-mingw64-x86_64.S -ASM_X86_64_MINGW64 += camellia/cmll-mingw64-x86_64.S ASM_X86_64_MINGW64 += md5/md5-mingw64-x86_64.S ASM_X86_64_MINGW64 += modes/ghash-mingw64-x86_64.S ASM_X86_64_MINGW64 += rc4/rc4-mingw64-x86_64.S diff --git a/update.sh b/update.sh index f4f7785..3e6dc5d 100755 --- a/update.sh +++ b/update.sh @@ -274,7 +274,6 @@ for abi in elf macosx masm mingw64; do gen_asm_stdout $abi bn/asm/modexp512-x86_64.pl bn/modexp512-$abi-x86_64.S gen_asm_stdout $abi bn/asm/x86_64-mont.pl bn/mont-$abi-x86_64.S gen_asm_stdout $abi bn/asm/x86_64-mont5.pl bn/mont5-$abi-x86_64.S - gen_asm_stdout $abi camellia/asm/cmll-x86_64.pl camellia/cmll-$abi-x86_64.S gen_asm_stdout $abi md5/asm/md5-x86_64.pl md5/md5-$abi-x86_64.S gen_asm_stdout $abi modes/asm/ghash-x86_64.pl modes/ghash-$abi-x86_64.S gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl rc4/rc4-$abi-x86_64.S -- cgit v1.2.3-55-g6feb