1 files changed, 12 insertions, 10 deletions

diff --git a/update.sh b/update.sh
index 514da89..9636ee7 100755
--- a/update.sh
+++ b/update.sh
@@ -132,10 +132,10 @@ copy_hdrs $libcrypto_src "stack/stack.h lhash/lhash.h stack/safestack.h
         hkdf/hkdf.h hmac/hmac.h rand/rand.h md5/md5.h
         x509/x509v3.h conf/conf.h ocsp/ocsp.h
         aes/aes.h modes/modes.h asn1/asn1t.h bf/blowfish.h
-        bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h conf/conf_api.h des/des.h dh/dh.h
+        bio/bio.h cast/cast.h cmac/cmac.h cms/cms.h des/des.h dh/dh.h
         dsa/dsa.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h
-        md4/md4.h ripemd/ripemd.h whrlpool/whrlpool.h idea/idea.h
-        rc2/rc2.h rc4/rc4.h ui/ui_compat.h txt_db/txt_db.h
+        md4/md4.h ripemd/ripemd.h idea/idea.h
+        rc2/rc2.h rc4/rc4.h txt_db/txt_db.h
         sm3/sm3.h sm4/sm4.h chacha/chacha.h evp/evp.h poly1305/poly1305.h
         camellia/camellia.h curve25519/curve25519.h
         ct/ct.h kdf/kdf.h"
@@ -170,6 +170,12 @@ for i in $libcrypto_src/arch/*; do
         arch=`basename $i`
         mkdir -p include/arch/$arch
         $CP $libcrypto_src/arch/$arch/opensslconf.h include/arch/$arch/
+        mkdir -p crypto/arch/$arch
+        $CP $libcrypto_src/arch/$arch/crypto_arch.h crypto/arch/$arch/
+        crypto_cpu_caps=$libcrypto_src/arch/$arch/crypto_cpu_caps.c
+        if [ -f "$crypto_cpu_caps" ]; then
+                $CP "$crypto_cpu_caps" crypto/arch/$arch/
+        fi
 done
 
 for i in $libcrypto_src/bn/arch/*; do
@@ -274,13 +280,8 @@ for abi in elf macosx masm mingw64; do
         gen_asm_stdout $abi bn/asm/modexp512-x86_64.pl   bn/modexp512-$abi-x86_64.S
         gen_asm_stdout $abi bn/asm/x86_64-mont.pl        bn/mont-$abi-x86_64.S
         gen_asm_stdout $abi bn/asm/x86_64-mont5.pl       bn/mont5-$abi-x86_64.S
-        gen_asm_stdout $abi md5/asm/md5-x86_64.pl        md5/md5-$abi-x86_64.S
         gen_asm_stdout $abi modes/asm/ghash-x86_64.pl    modes/ghash-$abi-x86_64.S
         gen_asm_stdout $abi rc4/asm/rc4-x86_64.pl        rc4/rc4-$abi-x86_64.S
-        gen_asm_stdout $abi sha/asm/sha1-x86_64.pl       sha/sha1-$abi-x86_64.S
-        gen_asm        $abi sha/asm/sha512-x86_64.pl     sha/sha256-$abi-x86_64.S
-        gen_asm        $abi sha/asm/sha512-x86_64.pl     sha/sha512-$abi-x86_64.S
-        gen_asm        $abi x86_64cpuid.pl               cpuid-$abi-x86_64.S
 done
 
 # copy libtls source
@@ -333,7 +334,7 @@ done
 echo "copying libssl source"
 rm -f ssl/*.c ssl/*.h
 touch ssl/empty.c
-for i in `awk '/SOURCES|HEADERS/ { print $3 }' ssl/Makefile.am` ; do
+for i in `awk '/SOURCES|HEADERS/ { if ($3 !~ /.*crypto_arch.*/) print $3 }' ssl/Makefile.am` ; do
         dir=`dirname $i`
         mkdir -p ssl/$dir
         $CP $libssl_src/$i ssl/$i
@@ -344,7 +345,7 @@ $GREP '^[A-Za-z0-9_]' < $libssl_src/Symbols.list > ssl/ssl.sym
 # copy libcrypto tests
 echo "copying tests"
 touch tests/empty.c
-for i in `find $libcrypto_regress -name '*.c'`; do
+for i in `find $libcrypto_regress -name '*.[ch]'`; do
          $CP "$i" tests
 done
 $CP $libcrypto_regress/evp/evptests.txt tests
@@ -352,6 +353,7 @@ $CP $libcrypto_regress/aead/*.txt tests
 $CP $libcrypto_regress/ct/ctlog.conf tests
 $CP $libcrypto_regress/ct/*.crt tests
 $CP $libcrypto_regress/x509/policy/*.pem tests
+$CP $libcrypto_regress/mlkem/*.txt tests
 
 # generate libcrypto freenull.c
 awk -f $libcrypto_regress/free/freenull.awk \