From 0207f1e2261c85a3c33d13d9b444ad2bae20feb2 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Thu, 28 Mar 2024 06:55:55 -0600 Subject: Remove md32_common.h, unconditionally link aes.c --- crypto/CMakeLists.txt | 1 - crypto/Makefile.am | 2 -- crypto/Makefile.am.elf-arm | 1 - crypto/Makefile.am.elf-mips | 1 - crypto/Makefile.am.elf-mips64 | 1 - 5 files changed, 6 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 47ab733..9d29e45 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -223,7 +223,6 @@ if((NOT HOST_ASM_ELF_X86_64) AND set( CRYPTO_SRC ${CRYPTO_SRC} - aes/aes_cbc.c camellia/camellia.c camellia/cmll_cbc.c whrlpool/wp_block.c diff --git a/crypto/Makefile.am b/crypto/Makefile.am index a71d918..398acf0 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -196,7 +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 += aes/aes_cbc.c libcrypto_la_SOURCES += aes/aes_core.c libcrypto_la_SOURCES += camellia/camellia.c libcrypto_la_SOURCES += camellia/cmll_cbc.c @@ -229,7 +228,6 @@ noinst_HEADERS += constant_time.h noinst_HEADERS += cryptlib.h noinst_HEADERS += crypto_internal.h noinst_HEADERS += crypto_local.h -noinst_HEADERS += md32_common.h noinst_HEADERS += x86_arch.h # aes diff --git a/crypto/Makefile.am.elf-arm b/crypto/Makefile.am.elf-arm index e24f87b..3ff4bc9 100644 --- a/crypto/Makefile.am.elf-arm +++ b/crypto/Makefile.am.elf-arm @@ -7,7 +7,6 @@ ASM_ARM_ELF += modes/ghash-elf-armv4.S ASM_ARM_ELF += armv4cpuid.S ASM_ARM_ELF += armcap.c -ASM_ARM_ELF += aes/aes_cbc.c ASM_ARM_ELF += camellia/camellia.c ASM_ARM_ELF += camellia/cmll_cbc.c ASM_ARM_ELF += whrlpool/wp_block.c diff --git a/crypto/Makefile.am.elf-mips b/crypto/Makefile.am.elf-mips index 34fda49..d10e59e 100644 --- a/crypto/Makefile.am.elf-mips +++ b/crypto/Makefile.am.elf-mips @@ -5,7 +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 += aes/aes_cbc.c ASM_MIPS_ELF += camellia/camellia.c ASM_MIPS_ELF += camellia/cmll_cbc.c ASM_MIPS_ELF += whrlpool/wp_block.c diff --git a/crypto/Makefile.am.elf-mips64 b/crypto/Makefile.am.elf-mips64 index abf2026..1c03584 100644 --- a/crypto/Makefile.am.elf-mips64 +++ b/crypto/Makefile.am.elf-mips64 @@ -5,7 +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 += aes/aes_cbc.c ASM_MIPS64_ELF += camellia/camellia.c ASM_MIPS64_ELF += camellia/cmll_cbc.c ASM_MIPS64_ELF += whrlpool/wp_block.c -- cgit v1.2.3-55-g6feb