From df5fd87f0bd182f0182a6b9e30e42b49c785eb43 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Wed, 5 Oct 2022 09:12:47 -0600
Subject: [PATCH 1/2] Modify checkout of aes_asm.S (and .asm) given commit
 6f4af15

---
 fips-check.sh | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/fips-check.sh b/fips-check.sh
index 68d35811d..1f62d3358 100755
--- a/fips-check.sh
+++ b/fips-check.sh
@@ -115,7 +115,7 @@ STM32L4_V2_FIPS_REPO=git@github.com:wolfSSL/fips.git
 STM32L4_V2_CRYPT_VERSION=WCv4.0.1-stable
 
 FIPS_SRCS=( fips.c fips_test.c )
-WC_MODS=( aes des3 sha sha256 sha512 rsa hmac random )
+WC_MODS=( aes des3 sha sha256 sha512 rsa hmac random aes_asm )
 TEST_DIR=XXX-fips-test
 CRYPT_INC_PATH=cyassl/ctaocrypt
 CRYPT_SRC_PATH=ctaocrypt/src
@@ -183,7 +183,6 @@ linuxv2 | fipsv2-OE-ready)
   FIPS_SRCS+=( wolfcrypt_first.c wolfcrypt_last.c )
   FIPS_INCS=( fips.h )
   FIPS_OPTION=v2
-  COPY_DIRECT=( wolfcrypt/src/aes_asm.S wolfcrypt/src/aes_asm.asm )
   ;;
 netbsd-selftest)
   FIPS_VERSION=$NETBSD_FIPS_VERSION
@@ -233,8 +232,7 @@ linuxv5)
   FIPS_SRCS=( fips.c fips_test.c wolfcrypt_first.c wolfcrypt_last.c )
   FIPS_INCS=( fips.h )
   FIPS_OPTION="v5"
-  COPY_DIRECT=( wolfcrypt/src/aes_asm.S wolfcrypt/src/aes_asm.asm
-                wolfcrypt/src/aes_gcm_asm.S
+  COPY_DIRECT=( wolfcrypt/src/aes_gcm_asm.S
                 wolfcrypt/src/sha256_asm.S wolfcrypt/src/sha512_asm.S )
   ;;
 fips-ready)
@@ -351,7 +349,18 @@ v2|rand|v5*)
     # Checkout the fips versions of the wolfCrypt files from the repo.
     for MOD in "${WC_MODS[@]}"
     do
-        $GIT checkout "my$CRYPT_VERSION" -- "$CRYPT_SRC_PATH/$MOD.c" "$CRYPT_INC_PATH/$MOD.h" || exit $?
+        if [ -f "$CRYPT_SRC_PATH/$MOD.c" ]; then
+            $GIT checkout "my$CRYPT_VERSION" -- "$CRYPT_SRC_PATH/$MOD.c" || exit $?
+        fi
+        if [ -f "$CRYPT_SRC_PATH/$MOD.S" ]; then
+            $GIT checkout "my$CRYPT_VERSION" -- "$CRYPT_SRC_PATH/$MOD.S" || exit $?
+        fi
+        if [ -f "$CRYPT_SRC_PATH/$MOD.asm" ]; then
+            $GIT checkout "my$CRYPT_VERSION" -- "$CRYPT_SRC_PATH/$MOD.asm" || exit $?
+        fi
+        if [ -f "$CRYPT_INC_PATH/$MOD.h" ]; then
+            $GIT checkout "my$CRYPT_VERSION" -- "$CRYPT_INC_PATH/$MOD.h" || exit $?
+        fi
     done
 
     for MOD in "${COPY_DIRECT[@]}"

From a2b48aac53d7115f14529a4c116644f6e59e5f64 Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Wed, 5 Oct 2022 10:00:47 -0600
Subject: [PATCH 2/2] Update v5 checkout for sha256_asm and sha512_asm

---
 fips-check.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/fips-check.sh b/fips-check.sh
index 1f62d3358..5902cdb4d 100755
--- a/fips-check.sh
+++ b/fips-check.sh
@@ -227,13 +227,13 @@ linuxv5)
   CRYPT_VERSION="WCv5.0-RC12"
   CRYPT_INC_PATH="wolfssl/wolfcrypt"
   CRYPT_SRC_PATH="wolfcrypt/src"
-  WC_MODS=( aes sha sha256 sha512 rsa hmac random cmac dh ecc sha3 kdf )
+  WC_MODS=( aes sha sha256 sha512 rsa hmac random cmac dh ecc sha3 kdf
+            aes_asm sha256_asm sha512_asm )
   RNG_VERSION="WCv5.0-RC12"
   FIPS_SRCS=( fips.c fips_test.c wolfcrypt_first.c wolfcrypt_last.c )
   FIPS_INCS=( fips.h )
   FIPS_OPTION="v5"
-  COPY_DIRECT=( wolfcrypt/src/aes_gcm_asm.S
-                wolfcrypt/src/sha256_asm.S wolfcrypt/src/sha512_asm.S )
+  COPY_DIRECT=( wolfcrypt/src/aes_gcm_asm.S )
   ;;
 fips-ready)
   FIPS_REPO="git@github.com:wolfSSL/fips.git"
@@ -352,10 +352,14 @@ v2|rand|v5*)
         if [ -f "$CRYPT_SRC_PATH/$MOD.c" ]; then
             $GIT checkout "my$CRYPT_VERSION" -- "$CRYPT_SRC_PATH/$MOD.c" || exit $?
         fi
+        # aes_asm.S, sha256_asm.S sha512_asm.S
         if [ -f "$CRYPT_SRC_PATH/$MOD.S" ]; then
+            echo "Checking out asm file: $MOD.S"
             $GIT checkout "my$CRYPT_VERSION" -- "$CRYPT_SRC_PATH/$MOD.S" || exit $?
         fi
+        # aes_asm.asm
         if [ -f "$CRYPT_SRC_PATH/$MOD.asm" ]; then
+            echo "Checking out asm file: $MOD.asm"
             $GIT checkout "my$CRYPT_VERSION" -- "$CRYPT_SRC_PATH/$MOD.asm" || exit $?
         fi
         if [ -f "$CRYPT_INC_PATH/$MOD.h" ]; then