1 files changed, 75 insertions, 42 deletions

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index e642b01..f67d2bd 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -1,30 +1,28 @@
-add_definitions(-DLIBRESSL_CRYPTO_INTERNAL)
+#
+# Copyright (c) 2014 Brent Cook
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-if(HOST_ASM_ELF_ARMV4)
-        set(
-                ASM_ARMV4_ELF_SRC
-                aes/aes-elf-armv4.S
-                bn/mont-elf-armv4.S
-                sha/sha1-elf-armv4.S
-                sha/sha512-elf-armv4.S
-                sha/sha256-elf-armv4.S
-                modes/ghash-elf-armv4.S
-                armv4cpuid.S
-                armcap.c
-        )
-        add_definitions(-DAES_ASM)
-        add_definitions(-DOPENSSL_BN_ASM_MONT)
-        add_definitions(-DGHASH_ASM)
-        add_definitions(-DOPENSSL_CPUID_OBJ)
-        set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC})
-endif()
+add_definitions(-DLIBRESSL_CRYPTO_INTERNAL)
 
 if(HOST_ASM_ELF_X86_64)
+        set(CRYPTO_SRC ${CRYPTO_SRC} aes/aes_amd64.c)
+        set(CRYPTO_SRC ${CRYPTO_SRC} bn/arch/amd64/bn_arch.c)
+        set(CRYPTO_SRC ${CRYPTO_SRC} modes/gcm128_amd64.c)
+
         set(
                 ASM_X86_64_ELF_SRC
                 aes/aes-elf-x86_64.S
-                aes/bsaes-elf-x86_64.S
-                aes/vpaes-elf-x86_64.S
                 aes/aesni-elf-x86_64.S
                 bn/modexp512-elf-x86_64.S
                 bn/mont-elf-x86_64.S
@@ -35,15 +33,24 @@ if(HOST_ASM_ELF_X86_64)
                 bn/arch/amd64/bignum_add.S
                 bn/arch/amd64/bignum_cmadd.S
                 bn/arch/amd64/bignum_cmul.S
+                bn/arch/amd64/bignum_modadd.S
+                bn/arch/amd64/bignum_modsub.S
                 bn/arch/amd64/bignum_mul.S
+                bn/arch/amd64/bignum_mul_4_8.S
                 bn/arch/amd64/bignum_mul_4_8_alt.S
+                bn/arch/amd64/bignum_mul_6_12.S
+                bn/arch/amd64/bignum_mul_6_12_alt.S
+                bn/arch/amd64/bignum_mul_8_16.S
                 bn/arch/amd64/bignum_mul_8_16_alt.S
                 bn/arch/amd64/bignum_sqr.S
+                bn/arch/amd64/bignum_sqr_4_8.S
                 bn/arch/amd64/bignum_sqr_4_8_alt.S
+                bn/arch/amd64/bignum_sqr_6_12.S
+                bn/arch/amd64/bignum_sqr_6_12_alt.S
+                bn/arch/amd64/bignum_sqr_8_16.S
                 bn/arch/amd64/bignum_sqr_8_16_alt.S
                 bn/arch/amd64/bignum_sub.S
                 bn/arch/amd64/word_clz.S
-                bn/arch/amd64/bn_arch.c
         )
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
@@ -57,11 +64,13 @@ if(HOST_ASM_ELF_X86_64)
 endif()
 
 if(HOST_ASM_MACOSX_X86_64)
+        set(CRYPTO_SRC ${CRYPTO_SRC} aes/aes_amd64.c)
+        set(CRYPTO_SRC ${CRYPTO_SRC} bn/arch/amd64/bn_arch.c)
+        set(CRYPTO_SRC ${CRYPTO_SRC} modes/gcm128_amd64.c)
+
         set(
                 ASM_X86_64_MACOSX_SRC
                 aes/aes-macosx-x86_64.S
-                aes/bsaes-macosx-x86_64.S
-                aes/vpaes-macosx-x86_64.S
                 aes/aesni-macosx-x86_64.S
                 bn/modexp512-macosx-x86_64.S
                 bn/mont-macosx-x86_64.S
@@ -72,15 +81,24 @@ if(HOST_ASM_MACOSX_X86_64)
                 bn/arch/amd64/bignum_add.S
                 bn/arch/amd64/bignum_cmadd.S
                 bn/arch/amd64/bignum_cmul.S
+                bn/arch/amd64/bignum_modadd.S
+                bn/arch/amd64/bignum_modsub.S
                 bn/arch/amd64/bignum_mul.S
+                bn/arch/amd64/bignum_mul_4_8.S
                 bn/arch/amd64/bignum_mul_4_8_alt.S
+                bn/arch/amd64/bignum_mul_6_12.S
+                bn/arch/amd64/bignum_mul_6_12_alt.S
+                bn/arch/amd64/bignum_mul_8_16.S
                 bn/arch/amd64/bignum_mul_8_16_alt.S
                 bn/arch/amd64/bignum_sqr.S
+                bn/arch/amd64/bignum_sqr_4_8.S
                 bn/arch/amd64/bignum_sqr_4_8_alt.S
+                bn/arch/amd64/bignum_sqr_6_12.S
+                bn/arch/amd64/bignum_sqr_6_12_alt.S
+                bn/arch/amd64/bignum_sqr_8_16.S
                 bn/arch/amd64/bignum_sqr_8_16_alt.S
                 bn/arch/amd64/bignum_sub.S
                 bn/arch/amd64/word_clz.S
-                bn/arch/amd64/bn_arch.c
         )
         add_definitions(-DAES_ASM)
         add_definitions(-DBSAES_ASM)
@@ -95,11 +113,12 @@ if(HOST_ASM_MACOSX_X86_64)
 endif()
 
 if(HOST_ASM_MASM_X86_64)
+        set(CRYPTO_SRC ${CRYPTO_SRC} aes/aes_amd64.c)
+        set(CRYPTO_SRC ${CRYPTO_SRC} modes/gcm128_amd64.c)
+
         set(
                 ASM_X86_64_MASM_SRC
                 aes/aes-masm-x86_64.S
-                aes/bsaes-masm-x86_64.S
-                aes/vpaes-masm-x86_64.S
                 aes/aesni-masm-x86_64.S
                 #bn/modexp512-masm-x86_64.S
                 #bn/mont-masm-x86_64.S
@@ -121,11 +140,12 @@ if(HOST_ASM_MASM_X86_64)
 endif()
 
 if(HOST_ASM_MINGW64_X86_64)
+        set(CRYPTO_SRC ${CRYPTO_SRC} aes/aes_amd64.c)
+        set(CRYPTO_SRC ${CRYPTO_SRC} modes/gcm128_amd64.c)
+
         set(
                 ASM_X86_64_MINGW64_SRC
                 aes/aes-mingw64-x86_64.S
-                aes/bsaes-mingw64-x86_64.S
-                aes/vpaes-mingw64-x86_64.S
                 aes/aesni-mingw64-x86_64.S
                 #bn/modexp512-mingw64-x86_64.S
                 #bn/mont-mingw64-x86_64.S
@@ -146,7 +166,17 @@ if(HOST_ASM_MINGW64_X86_64)
 endif()
 
 if(HOST_AARCH64)
-        set(CRYPTO_SRC ${CRYPTO_SRC} arch/aarch64/crypto_cpu_caps.c)
+        if(APPLE)
+                set(CRYPTO_SRC ${CRYPTO_SRC} arch/aarch64/crypto_cpu_caps_darwin.c)
+        elseif(LINUX)
+                set(CRYPTO_SRC ${CRYPTO_SRC} arch/aarch64/crypto_cpu_caps_linux.c)
+        elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+                set(CRYPTO_SRC ${CRYPTO_SRC} arch/aarch64/crypto_cpu_caps.c)
+        elseif(WIN32)
+                set(CRYPTO_SRC ${CRYPTO_SRC} arch/aarch64/crypto_cpu_caps_windows.c)
+        else()
+                set(CRYPTO_SRC ${CRYPTO_SRC} arch/aarch64/crypto_cpu_caps_none.c)
+        endif()
 elseif(HOST_X86_64)
         set(CRYPTO_SRC ${CRYPTO_SRC} arch/amd64/crypto_cpu_caps.c)
 elseif(HOST_I386)
@@ -163,7 +193,6 @@ set(
         crypto_memory.c
         aes/aes.c
         aes/aes_core.c
-        aes/aes_ige.c
         asn1/a_bitstr.c
         asn1/a_enum.c
         asn1/a_int.c
@@ -213,10 +242,8 @@ set(
         asn1/x_bignum.c
         asn1/x_crl.c
         asn1/x_exten.c
-        asn1/x_info.c
         asn1/x_long.c
         asn1/x_name.c
-        asn1/x_pkey.c
         asn1/x_pubkey.c
         asn1/x_req.c
         asn1/x_sig.c
@@ -245,6 +272,7 @@ set(
         bio/bss_null.c
         bio/bss_sock.c
         bn/bn_add.c
+        bn/bn_add_sub.c
         bn/bn_bpsw.c
         bn/bn_const.c
         bn/bn_convert.c
@@ -258,6 +286,7 @@ set(
         bn/bn_lib.c
         bn/bn_mod.c
         bn/bn_mod_sqrt.c
+        bn/bn_mod_words.c
         bn/bn_mont.c
         bn/bn_mul.c
         bn/bn_prime.c
@@ -339,11 +368,13 @@ set(
         ec/ec_convert.c
         ec/ec_curve.c
         ec/ec_err.c
+        ec/ec_field.c
         ec/ec_key.c
         ec/ec_lib.c
         ec/ec_mult.c
         ec/ec_pmeth.c
         ec/eck_prn.c
+        ec/ecp_hp_methods.c
         ec/ecp_methods.c
         ec/ecx_methods.c
         ecdh/ecdh.c
@@ -405,8 +436,10 @@ set(
         lhash/lhash.c
         md4/md4.c
         md5/md5.c
-        mlkem/mlkem768.c
+        mlkem/mlkem.c
         mlkem/mlkem1024.c
+        mlkem/mlkem768.c
+        mlkem/mlkem_key.c
         modes/cbc128.c
         modes/ccm128.c
         modes/cfb128.c
@@ -464,11 +497,7 @@ set(
         rand/rand_err.c
         rand/rand_lib.c
         rand/randfile.c
-        rc2/rc2_cbc.c
-        rc2/rc2_ecb.c
-        rc2/rc2_skey.c
-        rc2/rc2cfb64.c
-        rc2/rc2ofb64.c
+        rc2/rc2.c
         rc4/rc4.c
         ripemd/ripemd.c
         rsa/rsa_ameth.c
@@ -570,17 +599,17 @@ set(
 
 set(COMPAT_SRC empty.c)
 
+set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log)
+
 if(UNIX)
         set(CRYPTO_SRC ${CRYPTO_SRC} crypto_lock.c)
         set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_posix.c)
-        set(CRYPTO_SRC ${CRYPTO_SRC} bio/bss_log.c)
         set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl.c)
 endif()
 
 if(WIN32)
         set(CRYPTO_SRC ${CRYPTO_SRC} compat/crypto_lock_win.c)
         set(CRYPTO_SRC ${CRYPTO_SRC} bio/b_win.c)
-        set(CRYPTO_UNEXPORT ${CRYPTO_UNEXPORT} BIO_s_log)
         set(CRYPTO_SRC ${CRYPTO_SRC} ui/ui_openssl_win.c)
 endif()
 
@@ -736,6 +765,7 @@ add_library(crypto_obj OBJECT ${CRYPTO_SRC})
 target_include_directories(crypto_obj
         PRIVATE
                 .
+                aes
                 asn1
                 bio
                 bn
@@ -774,11 +804,14 @@ elseif(HOST_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)
-        # XXX - can this go away? the directory doesn't exist...
+        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)