Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20250102-fips-v6-update-to-5v7v6 #8328

Merged
merged 2 commits into from
Jan 3, 2025

Conversation

douzzer
Copy link
Contributor

@douzzer douzzer commented Jan 2, 2025

update FIPS v6 to point to wolfcrypt WCv6.0.0-RC3 (aka v5.7.6-stable) and fips WCv6.0.0-RC3.

tested with wolfssl-multi-test.sh ... check-source-text cross-aarch64-armasm-fips-140-3-v6-wc_RC3-unittest-sanitizer fips-140-3-v6-optest-acvp-sp-asm fips-140-3-v6-all

@douzzer douzzer requested a review from kaleb-himes January 2, 2025 21:55
@douzzer douzzer assigned douzzer and kaleb-himes and unassigned douzzer Jan 2, 2025
@kaleb-himes
Copy link
Contributor

kaleb-himes commented Jan 2, 2025

May I request one minor change to the ordering of the new files?

diff --git a/fips-check.sh b/fips-check.sh
index d0ceaf56e..e276ed3e0 100755
--- a/fips-check.sh
+++ b/fips-check.sh
@@ -261,6 +261,8 @@ v6.0.0)
     "wolfcrypt/src/port/arm/armv8-32-curve25519.S:${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-sha3-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/armv8-32-sha3-asm.S:${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:${ASM_PICKUPS_TAG}"
@@ -272,13 +274,6 @@ v6.0.0)
     "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/port/arm/armv8-32-sha3-asm_c.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/armv8-32-sha3-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/thumb2-sha3-asm_c.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/arm/thumb2-sha3-asm.S:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/riscv/riscv-64-sha256.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/riscv/riscv-64-sha512.c:${WOLF_REPO_TAG}"
-    "wolfcrypt/src/port/riscv/riscv-64-sha3.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}"
@@ -313,6 +308,8 @@ v6.0.0)
     "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-sha3-asm_c.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/arm/thumb2-sha3-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}"
@@ -333,6 +330,9 @@ v6.0.0)
     "wolfssl/wolfcrypt/sha256.h:${WOLF_REPO_TAG}"
     "wolfssl/wolfcrypt/sha3.h:${WOLF_REPO_TAG}"
     "wolfssl/wolfcrypt/sha512.h:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/riscv/riscv-64-sha256.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/riscv/riscv-64-sha3.c:${WOLF_REPO_TAG}"
+    "wolfcrypt/src/port/riscv/riscv-64-sha512.c:${WOLF_REPO_TAG}"
   )
   ;;
 fips-ready|fips-dev)

@douzzer
Copy link
Contributor Author

douzzer commented Jan 2, 2025

retest this please

@dgarske dgarske merged commit 71b7d0c into wolfSSL:master Jan 3, 2025
151 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants