From 95b74a0b10ccd36e6462778cbf246a25dcf196c4 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Thu, 28 Mar 2024 04:59:12 -0600 Subject: Place rc4.c in a more sensible place Fixes #1036 and https://github.com/google/oss-fuzz/pull/11741 --- crypto/CMakeLists.txt | 2 +- crypto/Makefile.am | 4 +++- crypto/Makefile.am.elf-arm | 1 - crypto/Makefile.am.elf-mips | 1 - crypto/Makefile.am.elf-mips64 | 1 - 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index f7d0bfe..47ab733 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -226,7 +226,6 @@ if((NOT HOST_ASM_ELF_X86_64) AND aes/aes_cbc.c camellia/camellia.c camellia/cmll_cbc.c - rc4/rc4.c whrlpool/wp_block.c ) endif() @@ -584,6 +583,7 @@ set( rc2/rc2_skey.c rc2/rc2cfb64.c rc2/rc2ofb64.c + rc4/rc4.c ripemd/ripemd.c rsa/rsa_ameth.c rsa/rsa_asn1.c diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 399a6a1..a71d918 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -200,7 +200,6 @@ 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 -libcrypto_la_SOURCES += rc4/rc4.c libcrypto_la_SOURCES += whrlpool/wp_block.c endif endif @@ -800,6 +799,9 @@ libcrypto_la_SOURCES += rc2/rc2cfb64.c libcrypto_la_SOURCES += rc2/rc2ofb64.c noinst_HEADERS += rc2/rc2_local.h +# rc4 +libcrypto_la_SOURCES += rc4/rc4.c + # ripemd libcrypto_la_SOURCES += ripemd/ripemd.c diff --git a/crypto/Makefile.am.elf-arm b/crypto/Makefile.am.elf-arm index af869ca..e24f87b 100644 --- a/crypto/Makefile.am.elf-arm +++ b/crypto/Makefile.am.elf-arm @@ -10,7 +10,6 @@ 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 += rc4/rc4.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 7e04da4..34fda49 100644 --- a/crypto/Makefile.am.elf-mips +++ b/crypto/Makefile.am.elf-mips @@ -8,7 +8,6 @@ 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 += rc4/rc4.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 1526020..abf2026 100644 --- a/crypto/Makefile.am.elf-mips64 +++ b/crypto/Makefile.am.elf-mips64 @@ -8,7 +8,6 @@ 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 += rc4/rc4.c ASM_MIPS64_ELF += whrlpool/wp_block.c EXTRA_DIST += $(ASM_MIPS64_ELF) -- cgit v1.2.3-55-g6feb