Cope with aes consolidation

2 files changed, 2 insertions, 10 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 06e25e6..f7d0bfe 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -244,12 +244,8 @@ set(
         mem_dbg.c
         o_fips.c
         o_str.c
-        aes/aes_cfb.c
-        aes/aes_ctr.c
-        aes/aes_ecb.c
+        aes/aes.c
         aes/aes_ige.c
-        aes/aes_ofb.c
-        aes/aes_wrap.c
         asn1/a_bitstr.c
         asn1/a_enum.c
         asn1/a_int.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 97c5ebd..c14c34d 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -234,12 +234,8 @@ noinst_HEADERS += md32_common.h
 noinst_HEADERS += x86_arch.h
 
 # aes
-libcrypto_la_SOURCES += aes/aes_cfb.c
-libcrypto_la_SOURCES += aes/aes_ctr.c
-libcrypto_la_SOURCES += aes/aes_ecb.c
+libcrypto_la_SOURCES += aes/aes.c
 libcrypto_la_SOURCES += aes/aes_ige.c
-libcrypto_la_SOURCES += aes/aes_ofb.c
-libcrypto_la_SOURCES += aes/aes_wrap.c
 noinst_HEADERS += aes/aes_local.h
 
 # asn1