From 6791d3f759019a91bcea6e171a7463b55d375f7d Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Fri, 22 Nov 2024 13:48:31 -0700
Subject: [PATCH 1/2] Add SRTP-KDF (v6.0.0) to checkout scipt

---
 fips-check.sh | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/fips-check.sh b/fips-check.sh
index 42ed96212..19a452f69 100755
--- a/fips-check.sh
+++ b/fips-check.sh
@@ -34,6 +34,7 @@ Flavor is one of:
     fips-dev (dev FIPS 140-3)
     wolfrand
     wolfentropy
+    v6.0.0
 Keep (default off) retains the temp dir $TEST_DIR for inspection.
 
 Example:
@@ -227,6 +228,97 @@ linuxv5.2.1)
     'wolfssl/wolfcrypt/sha512.h:v5.2.1-stable'
   )
   ;;
+v6.0.0)
+  WOLF_REPO_TAG='WCv6.0.0-RC1'
+  FIPS_REPO_TAG='WCv6.0.0-RC1'
+  FIPS_OPTION='v6'
+  FIPS_FILES=(
+    "wolfcrypt/src/fips.c:${FIPS_REPO_TAG}"
+    "wolfcrypt/src/fips_test.c:${FIPS_REPO_TAG}"
+    "wolfcrypt/src/wolfcrypt_first.c:${FIPS_REPO_TAG}"
+    "wolfcrypt/src/wolfcrypt_last.c:${FIPS_REPO_TAG}"
+    "wolfssl/wolfcrypt/fips.h:${FIPS_REPO_TAG}"
+  )
+  WOLFCRYPT_FILES=(
+    "wolfcrypt/src/aes_asm.asm:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/aes_asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/aes_gcm_asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/aes_gcm_x86_asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/aes_xts_asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/aes.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-aes-asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-curve25519_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-curve25519.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-sha256-asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-sha512-asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-aes.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-curve25519_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-curve25519.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha256.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha3-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha3-asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha512-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha512-asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha512.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/cmac.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/curve25519.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/curve448.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/dh.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/ecc.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/ed25519.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/ed448.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/hmac.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/kdf.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/pwdbased.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/random.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/rsa.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sha.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sha256_asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sha256.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sha3.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sha3_asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sha512_asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sha512.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_arm32.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_arm64.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_armthumb.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_c32.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_c64.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_cortexm.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_x86_64_asm.asm:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_x86_64_asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_x86_64.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/thumb2-aes-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/thumb2-aes-asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/thumb2-curve25519_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/thumb2-curve25519.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/thumb2-sha256-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/thumb2-sha256-asm.S:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/thumb2-sha512-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/thumb2-sha512-asm.S:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/aes.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/cmac.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/curve25519.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/curve448.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/dh.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/ecc.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/ed25519.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/ed448.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/fips_test.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/hmac.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/kdf.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/pwdbased.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/random.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/rsa.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/sha.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/sha256.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/sha3.h:${WOLF_REPO_TAG}"
+    "wolfssl/wolfcrypt/sha512.h:${WOLF_REPO_TAG}"
+  )
+  ;;
 fips-ready|fips-dev)
   FIPS_OPTION='ready'
   FIPS_FILES=(

From 8fbff480d732e0e85cc00415a63d70da6fbb729a Mon Sep 17 00:00:00 2001
From: kaleb-himes <kaleb@wolfssl.com>
Date: Mon, 25 Nov 2024 10:58:04 -0700
Subject: [PATCH 2/2] Pickup asm changes since 5.7.4 release

---
 fips-check.sh | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/fips-check.sh b/fips-check.sh
index 19a452f69..5ee63a704 100755
--- a/fips-check.sh
+++ b/fips-check.sh
@@ -231,6 +231,7 @@ linuxv5.2.1)
 v6.0.0)
   WOLF_REPO_TAG='WCv6.0.0-RC1'
   FIPS_REPO_TAG='WCv6.0.0-RC1'
+  ASM_PICKUPS_TAG='WCv6.0.0-RC2'
   FIPS_OPTION='v6'
   FIPS_FILES=(
     "wolfcrypt/src/fips.c:${FIPS_REPO_TAG}"
@@ -246,21 +247,21 @@ v6.0.0)
     "wolfcrypt/src/aes_gcm_x86_asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/aes_xts_asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/aes.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-aes-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-32-curve25519_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-curve25519_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-curve25519.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-sha256-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-32-sha512-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-aes.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-curve25519_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-aes.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/port/arm/armv8-curve25519_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-curve25519.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/armv8-sha256.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-sha3-asm_c.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-sha3-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-sha512-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha3-asm_c.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha3-asm.S:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/port/arm/armv8-sha512-asm_c.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/armv8-sha512-asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/armv8-sha512.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/cmac.c:${WOLF_REPO_TAG}"
@@ -282,15 +283,15 @@ v6.0.0)
     "wolfcrypt/src/sha3_asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/sha512_asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/sha512.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_arm32.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_arm64.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_armthumb.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_c32.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_c64.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_cortexm.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_arm32.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/sp_arm64.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/sp_armthumb.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/sp_c32.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/sp_c64.c:${ASM_PICKUPS_TAG}"
+    "wolfcrypt/src/sp_cortexm.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/sp_x86_64_asm.asm:${WOLF_REPO_TAG}"
     "wolfcrypt/src/sp_x86_64_asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/sp_x86_64.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/sp_x86_64.c:${ASM_PICKUPS_TAG}"
     "wolfcrypt/src/port/arm/thumb2-aes-asm_c.c:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/thumb2-aes-asm.S:${WOLF_REPO_TAG}"
     "wolfcrypt/src/port/arm/thumb2-curve25519_c.c:${WOLF_REPO_TAG}"