2 files changed, 92 insertions, 6 deletions

diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index e2eeab5..cd7e335 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -72,6 +72,13 @@ target_include_directories(ssl_obj
                 ../include
                 ${CMAKE_BINARY_DIR}/include)
 
+if(MSVC)
+        # "C4702" - unreachable code
+        set_source_files_properties(d1_pkt.c s3_cbc.c PROPERTIES
+                COMPILE_OPTIONS /wd4702
+        )
+endif()
+
 add_library(bs_obj OBJECT ${BS_SRC})
 target_include_directories(bs_obj
         PRIVATE
@@ -86,16 +93,16 @@ endif()
 
 export_symbol(ssl ${CMAKE_CURRENT_SOURCE_DIR}/ssl.sym)
 target_link_libraries(ssl crypto ${PLATFORM_LIBS})
-if (WIN32)
-        set(SSL_POSTFIX -${SSL_MAJOR_VERSION} PARENT_SCOPE)
-endif()
 set_target_properties(ssl PROPERTIES
-        OUTPUT_NAME ssl${SSL_POSTFIX}
-        ARCHIVE_OUTPUT_NAME ssl${SSL_POSTFIX}
+        OUTPUT_NAME ssl
+        ARCHIVE_OUTPUT_NAME ssl
         EXPORT_NAME SSL
         VERSION ${SSL_VERSION}
         SOVERSION ${SSL_MAJOR_VERSION}
 )
+if(NOT CMAKE_VERSION VERSION_LESS 3.27.0)
+        set_target_properties(ssl PROPERTIES DLL_NAME_WITH_SOVERSION TRUE)
+endif()
 
 target_include_directories(
         ssl
@@ -104,6 +111,30 @@ target_include_directories(
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
+if(HOST_AARCH64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/aarch64/)
+elseif(HOST_ARM)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/arm/)
+elseif(HOST_I386)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/i386/)
+elseif(HOST_LOONGARCH64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/loongarch64)
+elseif(HOST_MIPS64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/mips64)
+elseif(HOST_MIPS)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/mips)
+elseif(HOST_POWERPC)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/powerpc)
+elseif(HOST_POWERPC64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/powerpc64)
+elseif(HOST_RISCV64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/riscv64)
+elseif(HOST_SPARC64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/sparc64)
+elseif(HOST_X86_64)
+        target_include_directories(ssl_obj PRIVATE ../crypto/arch/amd64)
+endif()
+
 install(
         TARGETS ssl
         EXPORT SSL-target
@@ -135,4 +166,3 @@ if(BUILD_SHARED_LIBS)
         add_library(ssl-static STATIC $<TARGET_OBJECTS:ssl_obj>)
         target_link_libraries(ssl-static crypto-static ${PLATFORM_LIBS})
 endif()
-
diff --git a/ssl/Makefile.am b/ssl/Makefile.am
index a7a7d72..2c84bff 100644
--- a/ssl/Makefile.am
+++ b/ssl/Makefile.am
@@ -114,3 +114,59 @@ noinst_HEADERS += tls12_internal.h
 noinst_HEADERS += tls13_internal.h
 noinst_HEADERS += tls13_handshake.h
 noinst_HEADERS += tls13_record.h
+
+# arch
+if HOST_AARCH64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/aarch64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/aarch64/crypto_arch.h
+
+if HOST_ARM
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/arm/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/arm/crypto_arch.h
+
+if HOST_I386
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/i386/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/i386/crypto_arch.h
+
+if HOST_LOONGARCH64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/loongarch64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/loongarch64/crypto_arch.h
+
+if HOST_MIPS
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/mips/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/mips/crypto_arch.h
+
+if HOST_MIPS64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/mips64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/mips64/crypto_arch.h
+
+if HOST_POWERPC
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/powerpc/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/powerpc/crypto_arch.h
+
+if HOST_POWERPC64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/powerpc64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/powerpc64/crypto_arch.h
+
+if HOST_RISCV64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/riscv64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/riscv64/crypto_arch.h
+
+if HOST_SPARC64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/sparc64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/sparc64/crypto_arch.h
+
+if HOST_X86_64
+libssl_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/amd64/
+endif
+noinst_HEADERS += $(top_srcdir)/crypto/arch/amd64/crypto_arch.h