Skip to content

Commit 5125a3e

Browse files
lealem47lealem47
committed
Fix for: ./fips-check.sh wolfentropy keep
1 parent 9c511b3 commit 5125a3e

2 files changed

Lines changed: 13 additions & 82 deletions

File tree

‎fips-check.sh‎

Lines changed: 11 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -368,89 +368,17 @@ wolfentropy)
368368
FIPS_REPO_TAG='WCv6.0.0-RC4'
369369
ASM_PICKUPS_TAG='WCv6.0.0-RC4'
370370
WOLF_ENTROPY_TAG='wolfEntropy2'
371-
FIPS_OPTION='v6'
371+
FIPS_OPTION='disabled --enable-wolfentropy=random_c --disable-shake128
372+
--disable-shake256'
372373
FIPS_FILES=(
373-
"wolfcrypt/src/fips.c:${FIPS_REPO_TAG}"
374-
"wolfcrypt/src/fips_test.c:${FIPS_REPO_TAG}"
375-
"wolfcrypt/src/wolfcrypt_first.c:${FIPS_REPO_TAG}"
376-
"wolfcrypt/src/wolfcrypt_last.c:${FIPS_REPO_TAG}"
377-
"wolfssl/wolfcrypt/fips.h:${FIPS_REPO_TAG}"
378374
)
379375
WOLFCRYPT_FILES=(
380-
"wolfcrypt/src/aes_asm.asm:${WOLF_REPO_TAG}"
381-
"wolfcrypt/src/aes_asm.S:${WOLF_REPO_TAG}"
382-
"wolfcrypt/src/aes_gcm_asm.S:${WOLF_REPO_TAG}"
383-
"wolfcrypt/src/aes_gcm_x86_asm.S:${WOLF_REPO_TAG}"
384-
"wolfcrypt/src/aes_xts_asm.S:${WOLF_REPO_TAG}"
385-
"wolfcrypt/src/aes.c:${WOLF_REPO_TAG}"
386-
"wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c:${ASM_PICKUPS_TAG}"
387-
"wolfcrypt/src/port/arm/armv8-32-aes-asm.S:${WOLF_REPO_TAG}"
388-
"wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c:${ASM_PICKUPS_TAG}"
389-
"wolfcrypt/src/port/arm/armv8-32-sha256-asm.S:${WOLF_REPO_TAG}"
390-
"wolfcrypt/src/port/arm/armv8-32-sha3-asm_c.c:${WOLF_REPO_TAG}"
391-
"wolfcrypt/src/port/arm/armv8-32-sha3-asm.S:${WOLF_REPO_TAG}"
392-
"wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c:${ASM_PICKUPS_TAG}"
393-
"wolfcrypt/src/port/arm/armv8-32-sha512-asm.S:${WOLF_REPO_TAG}"
394-
"wolfcrypt/src/port/arm/armv8-aes.c:${ASM_PICKUPS_TAG}"
395-
"wolfcrypt/src/port/arm/armv8-sha256.c:${WOLF_REPO_TAG}"
396-
"wolfcrypt/src/port/arm/armv8-sha3-asm_c.c:${ASM_PICKUPS_TAG}"
397-
"wolfcrypt/src/port/arm/armv8-sha3-asm.S:${ASM_PICKUPS_TAG}"
398-
"wolfcrypt/src/port/arm/armv8-sha512-asm_c.c:${ASM_PICKUPS_TAG}"
399-
"wolfcrypt/src/port/arm/armv8-sha512-asm.S:${WOLF_REPO_TAG}"
400-
"wolfcrypt/src/port/arm/armv8-sha512.c:${WOLF_REPO_TAG}"
401-
"wolfcrypt/src/cmac.c:${WOLF_REPO_TAG}"
402-
"wolfcrypt/src/dh.c:${WOLF_REPO_TAG}"
403-
"wolfcrypt/src/ecc.c:${WOLF_REPO_TAG}"
404-
"wolfcrypt/src/ed25519.c:${WOLF_REPO_TAG}"
405-
"wolfcrypt/src/ed448.c:${WOLF_REPO_TAG}"
406-
"wolfcrypt/src/hmac.c:${WOLF_REPO_TAG}"
407-
"wolfcrypt/src/kdf.c:${WOLF_REPO_TAG}"
408-
"wolfcrypt/src/pwdbased.c:${WOLF_REPO_TAG}"
409376
"wolfcrypt/src/random.c:${WOLF_ENTROPY_TAG}"
410-
"wolfcrypt/src/rsa.c:${WOLF_REPO_TAG}"
411-
"wolfcrypt/src/sha.c:${WOLF_REPO_TAG}"
412-
"wolfcrypt/src/sha256_asm.S:${WOLF_REPO_TAG}"
413377
"wolfcrypt/src/sha256.c:${WOLF_REPO_TAG}"
414378
"wolfcrypt/src/sha3.c:${WOLF_REPO_TAG}"
415-
"wolfcrypt/src/sha3_asm.S:${WOLF_REPO_TAG}"
416-
"wolfcrypt/src/sha512_asm.S:${WOLF_REPO_TAG}"
417-
"wolfcrypt/src/sha512.c:${WOLF_REPO_TAG}"
418-
"wolfcrypt/src/sp_arm32.c:${ASM_PICKUPS_TAG}"
419-
"wolfcrypt/src/sp_arm64.c:${ASM_PICKUPS_TAG}"
420-
"wolfcrypt/src/sp_armthumb.c:${ASM_PICKUPS_TAG}"
421-
"wolfcrypt/src/sp_c32.c:${ASM_PICKUPS_TAG}"
422-
"wolfcrypt/src/sp_c64.c:${ASM_PICKUPS_TAG}"
423-
"wolfcrypt/src/sp_cortexm.c:${ASM_PICKUPS_TAG}"
424-
"wolfcrypt/src/sp_x86_64_asm.asm:${WOLF_REPO_TAG}"
425-
"wolfcrypt/src/sp_x86_64_asm.S:${WOLF_REPO_TAG}"
426-
"wolfcrypt/src/sp_x86_64.c:${ASM_PICKUPS_TAG}"
427-
"wolfcrypt/src/port/arm/thumb2-aes-asm_c.c:${WOLF_REPO_TAG}"
428-
"wolfcrypt/src/port/arm/thumb2-aes-asm.S:${WOLF_REPO_TAG}"
429-
"wolfcrypt/src/port/arm/thumb2-sha256-asm_c.c:${WOLF_REPO_TAG}"
430-
"wolfcrypt/src/port/arm/thumb2-sha256-asm.S:${WOLF_REPO_TAG}"
431-
"wolfcrypt/src/port/arm/thumb2-sha3-asm_c.c:${WOLF_REPO_TAG}"
432-
"wolfcrypt/src/port/arm/thumb2-sha3-asm.S:${WOLF_REPO_TAG}"
433-
"wolfcrypt/src/port/arm/thumb2-sha512-asm_c.c:${WOLF_REPO_TAG}"
434-
"wolfcrypt/src/port/arm/thumb2-sha512-asm.S:${WOLF_REPO_TAG}"
435-
"wolfssl/wolfcrypt/aes.h:${WOLF_REPO_TAG}"
436-
"wolfssl/wolfcrypt/cmac.h:${WOLF_REPO_TAG}"
437-
"wolfssl/wolfcrypt/dh.h:${WOLF_REPO_TAG}"
438-
"wolfssl/wolfcrypt/ecc.h:${WOLF_REPO_TAG}"
439-
"wolfssl/wolfcrypt/ed25519.h:${WOLF_REPO_TAG}"
440-
"wolfssl/wolfcrypt/ed448.h:${WOLF_REPO_TAG}"
441-
"wolfssl/wolfcrypt/fips_test.h:${WOLF_REPO_TAG}"
442-
"wolfssl/wolfcrypt/hmac.h:${WOLF_REPO_TAG}"
443-
"wolfssl/wolfcrypt/kdf.h:${WOLF_REPO_TAG}"
444-
"wolfssl/wolfcrypt/pwdbased.h:${WOLF_REPO_TAG}"
445379
"wolfssl/wolfcrypt/random.h:${WOLF_ENTROPY_TAG}"
446-
"wolfssl/wolfcrypt/rsa.h:${WOLF_REPO_TAG}"
447-
"wolfssl/wolfcrypt/sha.h:${WOLF_REPO_TAG}"
448380
"wolfssl/wolfcrypt/sha256.h:${WOLF_REPO_TAG}"
449381
"wolfssl/wolfcrypt/sha3.h:${WOLF_REPO_TAG}"
450-
"wolfssl/wolfcrypt/sha512.h:${WOLF_REPO_TAG}"
451-
"wolfcrypt/src/port/riscv/riscv-64-sha256.c:${WOLF_REPO_TAG}"
452-
"wolfcrypt/src/port/riscv/riscv-64-sha3.c:${WOLF_REPO_TAG}"
453-
"wolfcrypt/src/port/riscv/riscv-64-sha512.c:${WOLF_REPO_TAG}"
454382
)
455383
;;
456384

@@ -515,13 +443,15 @@ if [ ${#WOLFCRYPT_FILES[@]} -gt 0 ]; then
515443
fi
516444

517445
declare -a FIPS_TAGS_NEEDED_UNSORTED FIPS_TAGS_NEEDED
518-
for file_entry in "${FIPS_FILES[@]}"; do
519-
FIPS_TAGS_NEEDED_UNSORTED+=("${file_entry#*:}")
520-
done
521-
while IFS= read -r tag; do FIPS_TAGS_NEEDED+=("$tag"); done < <(IFS=$'\n'; sort -u <<< "${FIPS_TAGS_NEEDED_UNSORTED[*]}")
522-
if [ "${#FIPS_TAGS_NEEDED[@]}" = "0" ]; then
523-
echo "Error -- missing FIPS tags." 1>&2
524-
exit 1
446+
if [ ${#FIPS_FILES[@]} -gt 0 ]; then
447+
for file_entry in "${FIPS_FILES[@]}"; do
448+
FIPS_TAGS_NEEDED_UNSORTED+=("${file_entry#*:}")
449+
done
450+
while IFS= read -r tag; do FIPS_TAGS_NEEDED+=("$tag"); done < <(IFS=$'\n'; sort -u <<< "${FIPS_TAGS_NEEDED_UNSORTED[*]}")
451+
if [ "${#FIPS_TAGS_NEEDED[@]}" = "0" ]; then
452+
echo "Error -- missing FIPS tags." 1>&2
453+
exit 1
454+
fi
525455
fi
526456

527457
if [ ${#WOLFCRYPT_TAGS_NEEDED[@]} -gt 0 ]; then

‎tests/api/test_random.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,8 @@ int test_wc_RNG_TestSeed(void)
346346
XMEMSET(seed, 0xa5, sizeof(seed));
347347
/* Return value is DRBG_CONT_FAILURE which is not public. */
348348
/* Moving forward with the RCT test check LT instead of GT */
349-
#if !defined(HAVE_FIPS) || ( defined(HAVE_FIPS) && FIPS_VERSION3_GE(7,0,0) )
349+
#if !defined(HAVE_ENTROPY_MEMUSE) && !defined(HAVE_FIPS) || \
350+
( defined(HAVE_FIPS) && FIPS_VERSION3_GE(7,0,0) )
350351
ExpectIntLT(wc_RNG_TestSeed(seed, sizeof(seed)), 0);
351352
#else
352353
ExpectIntGT(wc_RNG_TestSeed(seed, sizeof(seed)), 0);

0 commit comments

Comments
 (0)