From 1d6c6c1cbda79a42049acd7fb0556bdbddd74d93 Mon Sep 17 00:00:00 2001
From: Theo Buehler <tb@openbsd.org>
Date: Thu, 28 Mar 2024 23:15:05 -0600
Subject: Consolidate AES sources

---
 crypto/CMakeLists.txt | 13 +------------
 crypto/Makefile.am    |  2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index b3c4c52..fdc0089 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -200,18 +200,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) AND
-	(NOT HOST_ASM_ELF_ARMV4))
-	set(
-		CRYPTO_SRC
-		${CRYPTO_SRC}
-		aes/aes_core.c
-	)
-endif()
-
 if((NOT HOST_ASM_ELF_X86_64) AND
 	(NOT HOST_ASM_MACOSX_X86_64) AND
 	(NOT HOST_ASM_MASM_X86_64) AND
@@ -238,6 +226,7 @@ set(
 	o_fips.c
 	o_str.c
 	aes/aes.c
+	aes/aes_core.c
 	aes/aes_ige.c
 	asn1/a_bitstr.c
 	asn1/a_enum.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index e070867..d6a551b 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_core.c
 libcrypto_la_SOURCES += camellia/camellia.c
 libcrypto_la_SOURCES += camellia/cmll_cbc.c
 endif
@@ -231,6 +230,7 @@ noinst_HEADERS += x86_arch.h
 
 # aes
 libcrypto_la_SOURCES += aes/aes.c
+libcrypto_la_SOURCES += aes/aes_core.c
 libcrypto_la_SOURCES += aes/aes_ige.c
 noinst_HEADERS += aes/aes_local.h
 
-- 
cgit v1.2.3-55-g6feb