1 files changed, 60 insertions, 116 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 5ee20ff..64bccd8 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -15,11 +15,7 @@ if(HOST_ASM_ELF_ARMV4)
         add_definitions(-DAES_ASM)
         add_definitions(-DOPENSSL_BN_ASM_MONT)
         add_definitions(-DGHASH_ASM)
-        add_definitions(-DSHA1_ASM)
-        add_definitions(-DSHA256_ASM)
-        add_definitions(-DSHA512_ASM)
         add_definitions(-DOPENSSL_CPUID_OBJ)
-        set_property(SOURCE ${ASM_ARMV4_ELF_SRC} PROPERTY LANGUAGE C)
         set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC})
 endif()
 
@@ -33,13 +29,8 @@ if(HOST_ASM_ELF_X86_64)
                 bn/modexp512-elf-x86_64.S
                 bn/mont-elf-x86_64.S
                 bn/mont5-elf-x86_64.S
-                md5/md5-elf-x86_64.S
                 modes/ghash-elf-x86_64.S
                 rc4/rc4-elf-x86_64.S
-                sha/sha1-elf-x86_64.S
-                sha/sha256-elf-x86_64.S
-                sha/sha512-elf-x86_64.S
-                cpuid-elf-x86_64.S
 
                 bn/arch/amd64/bignum_add.S
                 bn/arch/amd64/bignum_cmadd.S
@@ -57,24 +48,12 @@ 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)
-        add_definitions(-DMD5_ASM)
         add_definitions(-DGHASH_ASM)
         add_definitions(-DRSA_ASM)
-        add_definitions(-DSHA1_ASM)
-        add_definitions(-DSHA256_ASM)
-        add_definitions(-DSHA512_ASM)
-        add_definitions(-DWHIRLPOOL_ASM)
-        add_definitions(-DOPENSSL_CPUID_OBJ)
         set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC})
-        set_property(SOURCE ${ASM_X86_64_ELF_SRC} PROPERTY LANGUAGE C)
 endif()
 
 if(HOST_ASM_MACOSX_X86_64)
@@ -87,13 +66,8 @@ if(HOST_ASM_MACOSX_X86_64)
                 bn/modexp512-macosx-x86_64.S
                 bn/mont-macosx-x86_64.S
                 bn/mont5-macosx-x86_64.S
-                md5/md5-macosx-x86_64.S
                 modes/ghash-macosx-x86_64.S
                 rc4/rc4-macosx-x86_64.S
-                sha/sha1-macosx-x86_64.S
-                sha/sha256-macosx-x86_64.S
-                sha/sha512-macosx-x86_64.S
-                cpuid-macosx-x86_64.S
 
                 bn/arch/amd64/bignum_add.S
                 bn/arch/amd64/bignum_cmadd.S
@@ -111,24 +85,12 @@ 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)
-        add_definitions(-DMD5_ASM)
         add_definitions(-DGHASH_ASM)
         add_definitions(-DRSA_ASM)
-        add_definitions(-DSHA1_ASM)
-        add_definitions(-DSHA256_ASM)
-        add_definitions(-DSHA512_ASM)
-        add_definitions(-DWHIRLPOOL_ASM)
-        add_definitions(-DOPENSSL_CPUID_OBJ)
         set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC})
-        set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY LANGUAGE C)
         set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm")
 endif()
 
@@ -142,34 +104,18 @@ if(HOST_ASM_MASM_X86_64)
                 #bn/modexp512-masm-x86_64.S
                 #bn/mont-masm-x86_64.S
                 #bn/mont5-masm-x86_64.S
-                md5/md5-masm-x86_64.S
                 modes/ghash-masm-x86_64.S
                 rc4/rc4-masm-x86_64.S
-                sha/sha1-masm-x86_64.S
-                sha/sha256-masm-x86_64.S
-                sha/sha512-masm-x86_64.S
-                cpuid-masm-x86_64.S
         )
         add_definitions(-Dendbr64=)
         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)
-        add_definitions(-DMD5_ASM)
         add_definitions(-DGHASH_ASM)
         add_definitions(-DRSA_ASM)
-        add_definitions(-DSHA1_ASM)
-        add_definitions(-DSHA256_ASM)
-        add_definitions(-DSHA512_ASM)
-        add_definitions(-DWHIRLPOOL_ASM)
-        add_definitions(-DOPENSSL_CPUID_OBJ)
         set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
         set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM)
 endif()
@@ -184,50 +130,37 @@ if(HOST_ASM_MINGW64_X86_64)
                 #bn/modexp512-mingw64-x86_64.S
                 #bn/mont-mingw64-x86_64.S
                 #bn/mont5-mingw64-x86_64.S
-                md5/md5-mingw64-x86_64.S
                 modes/ghash-mingw64-x86_64.S
                 rc4/rc4-mingw64-x86_64.S
-                sha/sha1-mingw64-x86_64.S
-                sha/sha256-mingw64-x86_64.S
-                sha/sha512-mingw64-x86_64.S
-                cpuid-mingw64-x86_64.S
         )
         add_definitions(-Dendbr32=endbr64)
         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)
-        add_definitions(-DMD5_ASM)
         add_definitions(-DGHASH_ASM)
         add_definitions(-DRSA_ASM)
-        add_definitions(-DSHA1_ASM)
-        add_definitions(-DSHA256_ASM)
-        add_definitions(-DSHA512_ASM)
-        add_definitions(-DWHIRLPOOL_ASM)
-        add_definitions(-DOPENSSL_CPUID_OBJ)
         set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC})
-        set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C)
+endif()
+
+if(HOST_AARCH64)
+        set(CRYPTO_SRC ${CRYPTO_SRC} arch/aarch64/crypto_cpu_caps.c)
+elseif(HOST_X86_64)
+        set(CRYPTO_SRC ${CRYPTO_SRC} arch/amd64/crypto_cpu_caps.c)
+elseif(HOST_I386)
+        set(CRYPTO_SRC ${CRYPTO_SRC} arch/i386/crypto_cpu_caps.c)
 endif()
 
 set(
         CRYPTO_SRC
         ${CRYPTO_SRC}
-        cpt_err.c
-        cryptlib.c
+        crypto_err.c
+        crypto_ex_data.c
         crypto_init.c
-        cversion.c
-        ex_data.c
-        malloc-wrapper.c
-        mem_clr.c
-        mem_dbg.c
-        o_fips.c
+        crypto_legacy.c
+        crypto_memory.c
         aes/aes.c
         aes/aes_core.c
         aes/aes_ige.c
@@ -364,7 +297,6 @@ set(
         conf/conf_def.c
         conf/conf_err.c
         conf/conf_lib.c
-        conf/conf_mall.c
         conf/conf_mod.c
         conf/conf_sap.c
         ct/ct_b64.c
@@ -379,26 +311,11 @@ set(
         ct/ct_x509v3.c
         curve25519/curve25519-generic.c
         curve25519/curve25519.c
-        des/cbc_cksm.c
-        des/cbc_enc.c
-        des/cfb64ede.c
-        des/cfb64enc.c
-        des/cfb_enc.c
+        des/des.c
+        des/des_cksum.c
         des/des_enc.c
-        des/ecb3_enc.c
-        des/ecb_enc.c
-        des/ede_cbcm_enc.c
-        des/enc_read.c
-        des/fcrypt.c
-        des/fcrypt_b.c
-        des/ofb64ede.c
-        des/ofb64enc.c
-        des/ofb_enc.c
-        des/pcbc_enc.c
-        des/qud_cksm.c
-        des/set_key.c
-        des/str2key.c
-        des/xcbc_enc.c
+        des/des_fcrypt.c
+        des/des_key.c
         dh/dh_ameth.c
         dh/dh_asn1.c
         dh/dh_check.c
@@ -419,21 +336,15 @@ set(
         dsa/dsa_prn.c
         ec/ec_ameth.c
         ec/ec_asn1.c
-        ec/ec_check.c
+        ec/ec_convert.c
         ec/ec_curve.c
-        ec/ec_cvt.c
         ec/ec_err.c
         ec/ec_key.c
-        ec/ec_kmeth.c
         ec/ec_lib.c
         ec/ec_mult.c
-        ec/ec_oct.c
         ec/ec_pmeth.c
-        ec/ec_print.c
         ec/eck_prn.c
-        ec/ecp_mont.c
-        ec/ecp_oct.c
-        ec/ecp_smpl.c
+        ec/ecp_methods.c
         ec/ecx_methods.c
         ecdh/ecdh.c
         ecdsa/ecdsa.c
@@ -476,7 +387,6 @@ set(
         evp/m_sha3.c
         evp/m_sigver.c
         evp/m_sm3.c
-        evp/m_wp.c
         evp/p_legacy.c
         evp/p_lib.c
         evp/p_sign.c
@@ -495,6 +405,8 @@ set(
         lhash/lhash.c
         md4/md4.c
         md5/md5.c
+        mlkem/mlkem768.c
+        mlkem/mlkem1024.c
         modes/cbc128.c
         modes/ccm128.c
         modes/cfb128.c
@@ -599,8 +511,6 @@ set(
         ui/ui_err.c
         ui/ui_lib.c
         ui/ui_null.c
-        ui/ui_util.c
-        whrlpool/whirlpool.c
         x509/by_dir.c
         x509/by_file.c
         x509/by_mem.c
@@ -641,6 +551,7 @@ set(
         x509/x509_r2x.c
         x509/x509_req.c
         x509/x509_set.c
+        x509/x509_siginfo.c
         x509/x509_skey.c
         x509/x509_trs.c
         x509/x509_txt.c
@@ -685,6 +596,14 @@ if(NOT HAVE_FREEZERO)
         set(COMPAT_SRC ${COMPAT_SRC} compat/freezero.c)
 endif()
 
+if(NOT HAVE_GETDELIM)
+        set(COMPAT_SRC ${COMPAT_SRC} compat/getdelim.c)
+endif()
+
+if(NOT HAVE_GETLINE)
+        set(COMPAT_SRC ${COMPAT_SRC} compat/getline.c)
+endif()
+
 if(NOT HAVE_GETOPT)
         set(COMPAT_SRC ${COMPAT_SRC} compat/getopt_long.c)
 endif()
@@ -821,6 +740,7 @@ target_include_directories(crypto_obj
                 bio
                 bn
                 bytestring
+                conf
                 dh
                 dsa
                 curve25519
@@ -832,6 +752,7 @@ target_include_directories(crypto_obj
                 hidden
                 hmac
                 lhash
+                mlkem
                 modes
                 ocsp
                 pkcs12
@@ -845,41 +766,65 @@ 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_LOONGARCH64)
+        target_include_directories(crypto_obj PRIVATE arch/loongarch64)
+        target_include_directories(crypto_obj PRIVATE bn/arch/loongarch64)
 elseif(HOST_MIPS64)
+        target_include_directories(crypto_obj PRIVATE arch/mips64)
         target_include_directories(crypto_obj PRIVATE bn/arch/mips64)
 elseif(HOST_MIPS)
+        target_include_directories(crypto_obj PRIVATE arch/mips)
         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()
 
+if(MSVC)
+        # "C4701" - Potentially uninitialized local variable 'name' used
+        set_source_files_properties(bn/bn_convert.c pem/pem_lib.c PROPERTIES
+                COMPILE_OPTIONS /wd4701
+        )
+        # "C4702" - unreachable code
+        set_source_files_properties(pkcs7/pk7_doit.c PROPERTIES
+                COMPILE_OPTIONS /wd4702
+        )
+endif()
+
 add_library(crypto $<TARGET_OBJECTS:crypto_obj> $<TARGET_OBJECTS:compat_obj> empty.c)
 
 export_symbol(crypto ${CMAKE_CURRENT_BINARY_DIR}/crypto_p.sym)
 target_link_libraries(crypto ${PLATFORM_LIBS})
-if (WIN32)
-        set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION} PARENT_SCOPE)
-endif()
 set_target_properties(crypto PROPERTIES
-        OUTPUT_NAME crypto${CRYPTO_POSTFIX}
-        ARCHIVE_OUTPUT_NAME crypto${CRYPTO_POSTFIX}
+        OUTPUT_NAME crypto
+        ARCHIVE_OUTPUT_NAME crypto
         EXPORT_NAME Crypto
         VERSION ${CRYPTO_VERSION}
         SOVERSION ${CRYPTO_MAJOR_VERSION}
 )
+if(NOT CMAKE_VERSION VERSION_LESS 3.27.0)
+        set_target_properties(crypto PROPERTIES DLL_NAME_WITH_SOVERSION TRUE)
+endif()
 
 target_include_directories(
         crypto
@@ -919,4 +864,3 @@ if(BUILD_SHARED_LIBS)
         add_library(crypto-static STATIC $<TARGET_OBJECTS:crypto_obj>)
         target_link_libraries(crypto-static ${PLATFORM_LIBS})
 endif()
-