6 files changed, 30 insertions, 41 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 7d4ff70..4492360 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -57,11 +57,6 @@ if(HOST_ASM_ELF_X86_64)
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
         add_definitions(-DVPAES_ASM)
-        add_definitions(-DHAVE_AES_CBC_ENCRYPT_INTERNAL)
-        add_definitions(-DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL)
-        add_definitions(-DHAVE_AES_SET_DECRYPT_KEY_INTERNAL)
-        add_definitions(-DHAVE_AES_ENCRYPT_INTERNAL)
-        add_definitions(-DHAVE_AES_DECRYPT_INTERNAL)
         add_definitions(-DOPENSSL_IA32_SSE2)
         add_definitions(-DOPENSSL_BN_ASM_MONT)
         add_definitions(-DOPENSSL_BN_ASM_MONT5)
@@ -111,11 +106,6 @@ if(HOST_ASM_MACOSX_X86_64)
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
         add_definitions(-DVPAES_ASM)
-        add_definitions(-DHAVE_AES_CBC_ENCRYPT_INTERNAL)
-        add_definitions(-DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL)
-        add_definitions(-DHAVE_AES_SET_DECRYPT_KEY_INTERNAL)
-        add_definitions(-DHAVE_AES_ENCRYPT_INTERNAL)
-        add_definitions(-DHAVE_AES_DECRYPT_INTERNAL)
         add_definitions(-DOPENSSL_IA32_SSE2)
         add_definitions(-DOPENSSL_BN_ASM_MONT)
         add_definitions(-DOPENSSL_BN_ASM_MONT5)
@@ -154,11 +144,6 @@ if(HOST_ASM_MASM_X86_64)
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
         add_definitions(-DVPAES_ASM)
-        add_definitions(-DHAVE_AES_CBC_ENCRYPT_INTERNAL)
-        add_definitions(-DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL)
-        add_definitions(-DHAVE_AES_SET_DECRYPT_KEY_INTERNAL)
-        add_definitions(-DHAVE_AES_ENCRYPT_INTERNAL)
-        add_definitions(-DHAVE_AES_DECRYPT_INTERNAL)
         add_definitions(-DOPENSSL_IA32_SSE2)
         #add_definitions(-DOPENSSL_BN_ASM_MONT)
         #add_definitions(-DOPENSSL_BN_ASM_MONT5)
@@ -196,11 +181,6 @@ if(HOST_ASM_MINGW64_X86_64)
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
         add_definitions(-DVPAES_ASM)
-        add_definitions(-DHAVE_AES_CBC_ENCRYPT_INTERNAL)
-        add_definitions(-DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL)
-        add_definitions(-DHAVE_AES_SET_DECRYPT_KEY_INTERNAL)
-        add_definitions(-DHAVE_AES_ENCRYPT_INTERNAL)
-        add_definitions(-DHAVE_AES_DECRYPT_INTERNAL)
         add_definitions(-DOPENSSL_IA32_SSE2)
         #add_definitions(-DOPENSSL_BN_ASM_MONT)
         #add_definitions(-DOPENSSL_BN_ASM_MONT5)
@@ -845,24 +825,34 @@ target_include_directories(crypto_obj
                 ${CMAKE_BINARY_DIR}/include)
 
 if(HOST_AARCH64)
+        target_include_directories(crypto_obj PRIVATE arch/aarch64/)
         target_include_directories(crypto_obj PRIVATE bn/arch/aarch64/)
 elseif(HOST_ARM)
+        target_include_directories(crypto_obj PRIVATE arch/arm/)
         target_include_directories(crypto_obj PRIVATE bn/arch/arm/)
 elseif(HOST_I386)
+        target_include_directories(crypto_obj PRIVATE arch/i386/)
         target_include_directories(crypto_obj PRIVATE bn/arch/i386/)
 elseif(HOST_MIPS64)
+        target_include_directories(crypto_obj PRIVATE arch/mips64)
         target_include_directories(crypto_obj PRIVATE bn/arch/mips64)
 elseif(HOST_MIPS)
+        # XXX - can this go away? the directory doesn't exist...
         target_include_directories(crypto_obj PRIVATE bn/arch/mips)
 elseif(HOST_POWERPC)
+        target_include_directories(crypto_obj PRIVATE arch/powerpc)
         target_include_directories(crypto_obj PRIVATE bn/arch/powerpc)
 elseif(HOST_POWERPC64)
+        target_include_directories(crypto_obj PRIVATE arch/powerpc64)
         target_include_directories(crypto_obj PRIVATE bn/arch/powerpc64)
 elseif(HOST_RISCV64)
+        target_include_directories(crypto_obj PRIVATE arch/riscv64)
         target_include_directories(crypto_obj PRIVATE bn/arch/riscv64)
 elseif(HOST_SPARC64)
+        target_include_directories(crypto_obj PRIVATE arch/sparc64)
         target_include_directories(crypto_obj PRIVATE bn/arch/sparc64)
 elseif(HOST_X86_64)
+        target_include_directories(crypto_obj PRIVATE arch/amd64)
         target_include_directories(crypto_obj PRIVATE bn/arch/amd64)
 endif()
 
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index cb463fb..4ca8d5f 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -359,55 +359,74 @@ noinst_HEADERS += bn/bn_prime.h
 noinst_HEADERS += bn/s2n_bignum.h
 noinst_HEADERS += bn/s2n_bignum_internal.h
 
-# bn/arch
+# arch, bn/arch
 if HOST_AARCH64
+libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/aarch64/
 libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/aarch64/
 endif
+noinst_HEADERS += arch/aarch64/crypto_arch.h
 noinst_HEADERS += bn/arch/aarch64/bn_arch.h
 
 if HOST_ARM
+libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/arm/
 libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/arm/
 endif
+noinst_HEADERS += arch/arm/crypto_arch.h
 noinst_HEADERS += bn/arch/arm/bn_arch.h
 
 if HOST_I386
+libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/i386/
 libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/i386/
 endif
+noinst_HEADERS += arch/i386/crypto_arch.h
 noinst_HEADERS += bn/arch/i386/bn_arch.h
 
+# XXX - do we still need this?
 if HOST_MIPS
 libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/mips/
 endif
 noinst_HEADERS += bn/arch/mips/bn_arch.h
 
 if HOST_MIPS64
+libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/mips64/
 libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/mips64/
 endif
+noinst_HEADERS += arch/mips64/crypto_arch.h
 noinst_HEADERS += bn/arch/mips64/bn_arch.h
 
 if HOST_POWERPC
+libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/powerpc/
 libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/powerpc/
 endif
+noinst_HEADERS += arch/powerpc/crypto_arch.h
 noinst_HEADERS += bn/arch/powerpc/bn_arch.h
 
 if HOST_POWERPC64
+libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/powerpc64/
 libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/powerpc64/
 endif
+noinst_HEADERS += arch/powerpc64/crypto_arch.h
 noinst_HEADERS += bn/arch/powerpc64/bn_arch.h
 
 if HOST_RISCV64
+libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/riscv64/
 libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/riscv64/
 endif
+noinst_HEADERS += arch/riscv64/crypto_arch.h
 noinst_HEADERS += bn/arch/riscv64/bn_arch.h
 
 if HOST_SPARC64
+libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/sparc64/
 libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/sparc64/
 endif
+noinst_HEADERS += arch/sparc64/crypto_arch.h
 noinst_HEADERS += bn/arch/sparc64/bn_arch.h
 
 if HOST_X86_64
+libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/amd64/
 libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/amd64/
 endif
+noinst_HEADERS += arch/amd64/crypto_arch.h
 noinst_HEADERS += bn/arch/amd64/bn_arch.h
 
 # buffer
diff --git a/crypto/Makefile.am.elf-x86_64 b/crypto/Makefile.am.elf-x86_64
index 6933a11..990475e 100644
--- a/crypto/Makefile.am.elf-x86_64
+++ b/crypto/Makefile.am.elf-x86_64
@@ -33,11 +33,6 @@ if HOST_ASM_ELF_X86_64
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
-libcrypto_la_CPPFLAGS += -DHAVE_AES_CBC_ENCRYPT_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_ENCRYPT_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_DECRYPT_INTERNAL
 libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
diff --git a/crypto/Makefile.am.macosx-x86_64 b/crypto/Makefile.am.macosx-x86_64
index 1020567..c380003 100644
--- a/crypto/Makefile.am.macosx-x86_64
+++ b/crypto/Makefile.am.macosx-x86_64
@@ -33,11 +33,6 @@ if HOST_ASM_MACOSX_X86_64
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
-libcrypto_la_CPPFLAGS += -DHAVE_AES_CBC_ENCRYPT_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_ENCRYPT_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_DECRYPT_INTERNAL
 libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
diff --git a/crypto/Makefile.am.masm-x86_64 b/crypto/Makefile.am.masm-x86_64
index 7da3cc2..437638c 100644
--- a/crypto/Makefile.am.masm-x86_64
+++ b/crypto/Makefile.am.masm-x86_64
@@ -20,11 +20,6 @@ if HOST_ASM_MASM_X86_64
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
-libcrypto_la_CPPFLAGS += -DHAVE_AES_CBC_ENCRYPT_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_ENCRYPT_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_DECRYPT_INTERNAL
 libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5
diff --git a/crypto/Makefile.am.mingw64-x86_64 b/crypto/Makefile.am.mingw64-x86_64
index 7d0d3f7..2d41c37 100644
--- a/crypto/Makefile.am.mingw64-x86_64
+++ b/crypto/Makefile.am.mingw64-x86_64
@@ -21,11 +21,6 @@ libcrypto_la_CPPFLAGS += -Dendbr32=endbr64
 libcrypto_la_CPPFLAGS += -DAES_ASM
 libcrypto_la_CPPFLAGS += -DBSAES_ASM
 libcrypto_la_CPPFLAGS += -DVPAES_ASM
-libcrypto_la_CPPFLAGS += -DHAVE_AES_CBC_ENCRYPT_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_ENCRYPT_KEY_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_ENCRYPT_INTERNAL
-libcrypto_la_CPPFLAGS += -DHAVE_AES_DECRYPT_INTERNAL
 libcrypto_la_CPPFLAGS += -DOPENSSL_IA32_SSE2
 #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 #libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT5