Skip to content

Commit d49eb5f

Browse files
douzzerdouzzer
authored
Merge pull request #8920 from kaleb-himes/wolfEntropy-2025
Update wolfEntropy checkout with AdPr update
2 parents 6fb1c54 + f5f0bdf commit d49eb5f

1 file changed

Lines changed: 83 additions & 27 deletions

File tree

‎fips-check.sh‎

Lines changed: 83 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -362,37 +362,93 @@ wolfrand)
362362
)
363363
;;
364364
wolfentropy)
365+
WOLF_REPO_TAG='WCv6.0.0-RC5'
366+
FIPS_REPO_TAG='WCv6.0.0-RC4'
367+
ASM_PICKUPS_TAG='WCv6.0.0-RC4'
368+
WOLF_ENTROPY_TAG='wolfEntropy2'
365369
FIPS_OPTION='v6'
366370
FIPS_FILES=(
367-
'wolfcrypt/src/fips.c:wolfEntropy1'
368-
'wolfcrypt/src/fips_test.c:wolfEntropy1'
369-
'wolfcrypt/src/wolfcrypt_first.c:wolfEntropy1'
370-
'wolfcrypt/src/wolfcrypt_last.c:wolfEntropy1'
371-
'wolfssl/wolfcrypt/fips.h:wolfEntropy1'
371+
"wolfcrypt/src/fips.c:${FIPS_REPO_TAG}"
372+
"wolfcrypt/src/fips_test.c:${FIPS_REPO_TAG}"
373+
"wolfcrypt/src/wolfcrypt_first.c:${FIPS_REPO_TAG}"
374+
"wolfcrypt/src/wolfcrypt_last.c:${FIPS_REPO_TAG}"
375+
"wolfssl/wolfcrypt/fips.h:${FIPS_REPO_TAG}"
372376
)
373377
WOLFCRYPT_FILES=(
374-
'wolfcrypt/src/aes.c:wolfEntropy1'
375-
'wolfcrypt/src/aes_asm.asm:wolfEntropy1'
376-
'wolfcrypt/src/aes_asm.S:wolfEntropy1'
377-
'wolfcrypt/src/aes_gcm_asm.S:wolfEntropy1'
378-
'wolfcrypt/src/ecc.c:wolfEntropy1'
379-
'wolfcrypt/src/hmac.c:wolfEntropy1'
380-
'wolfcrypt/src/kdf.c:wolfEntropy1'
381-
'wolfcrypt/src/random.c:wolfEntropy1'
382-
'wolfcrypt/src/sha256.c:wolfEntropy1'
383-
'wolfcrypt/src/sha256_asm.S:wolfEntropy1'
384-
'wolfcrypt/src/sha3.c:wolfEntropy1'
385-
'wolfcrypt/src/sha512.c:wolfEntropy1'
386-
'wolfcrypt/src/sha512_asm.S:wolfEntropy1'
387-
'wolfssl/wolfcrypt/aes.h:wolfEntropy1'
388-
'wolfssl/wolfcrypt/ecc.h:wolfEntropy1'
389-
'wolfssl/wolfcrypt/fips_test.h:wolfEntropy1'
390-
'wolfssl/wolfcrypt/hmac.h:wolfEntropy1'
391-
'wolfssl/wolfcrypt/kdf.h:wolfEntropy1'
392-
'wolfssl/wolfcrypt/random.h:wolfEntropy1'
393-
'wolfssl/wolfcrypt/sha256.h:wolfEntropy1'
394-
'wolfssl/wolfcrypt/sha3.h:wolfEntropy1'
395-
'wolfssl/wolfcrypt/sha512.h:wolfEntropy1'
378+
"wolfcrypt/src/aes_asm.asm:${WOLF_REPO_TAG}"
379+
"wolfcrypt/src/aes_asm.S:${WOLF_REPO_TAG}"
380+
"wolfcrypt/src/aes_gcm_asm.S:${WOLF_REPO_TAG}"
381+
"wolfcrypt/src/aes_gcm_x86_asm.S:${WOLF_REPO_TAG}"
382+
"wolfcrypt/src/aes_xts_asm.S:${WOLF_REPO_TAG}"
383+
"wolfcrypt/src/aes.c:${WOLF_REPO_TAG}"
384+
"wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c:${ASM_PICKUPS_TAG}"
385+
"wolfcrypt/src/port/arm/armv8-32-aes-asm.S:${WOLF_REPO_TAG}"
386+
"wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c:${ASM_PICKUPS_TAG}"
387+
"wolfcrypt/src/port/arm/armv8-32-sha256-asm.S:${WOLF_REPO_TAG}"
388+
"wolfcrypt/src/port/arm/armv8-32-sha3-asm_c.c:${WOLF_REPO_TAG}"
389+
"wolfcrypt/src/port/arm/armv8-32-sha3-asm.S:${WOLF_REPO_TAG}"
390+
"wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c:${ASM_PICKUPS_TAG}"
391+
"wolfcrypt/src/port/arm/armv8-32-sha512-asm.S:${WOLF_REPO_TAG}"
392+
"wolfcrypt/src/port/arm/armv8-aes.c:${ASM_PICKUPS_TAG}"
393+
"wolfcrypt/src/port/arm/armv8-sha256.c:${WOLF_REPO_TAG}"
394+
"wolfcrypt/src/port/arm/armv8-sha3-asm_c.c:${ASM_PICKUPS_TAG}"
395+
"wolfcrypt/src/port/arm/armv8-sha3-asm.S:${ASM_PICKUPS_TAG}"
396+
"wolfcrypt/src/port/arm/armv8-sha512-asm_c.c:${ASM_PICKUPS_TAG}"
397+
"wolfcrypt/src/port/arm/armv8-sha512-asm.S:${WOLF_REPO_TAG}"
398+
"wolfcrypt/src/port/arm/armv8-sha512.c:${WOLF_REPO_TAG}"
399+
"wolfcrypt/src/cmac.c:${WOLF_REPO_TAG}"
400+
"wolfcrypt/src/dh.c:${WOLF_REPO_TAG}"
401+
"wolfcrypt/src/ecc.c:${WOLF_REPO_TAG}"
402+
"wolfcrypt/src/ed25519.c:${WOLF_REPO_TAG}"
403+
"wolfcrypt/src/ed448.c:${WOLF_REPO_TAG}"
404+
"wolfcrypt/src/hmac.c:${WOLF_REPO_TAG}"
405+
"wolfcrypt/src/kdf.c:${WOLF_REPO_TAG}"
406+
"wolfcrypt/src/pwdbased.c:${WOLF_REPO_TAG}"
407+
"wolfcrypt/src/random.c:${WOLF_ENTROPY_TAG}"
408+
"wolfcrypt/src/rsa.c:${WOLF_REPO_TAG}"
409+
"wolfcrypt/src/sha.c:${WOLF_REPO_TAG}"
410+
"wolfcrypt/src/sha256_asm.S:${WOLF_REPO_TAG}"
411+
"wolfcrypt/src/sha256.c:${WOLF_REPO_TAG}"
412+
"wolfcrypt/src/sha3.c:${WOLF_REPO_TAG}"
413+
"wolfcrypt/src/sha3_asm.S:${WOLF_REPO_TAG}"
414+
"wolfcrypt/src/sha512_asm.S:${WOLF_REPO_TAG}"
415+
"wolfcrypt/src/sha512.c:${WOLF_REPO_TAG}"
416+
"wolfcrypt/src/sp_arm32.c:${ASM_PICKUPS_TAG}"
417+
"wolfcrypt/src/sp_arm64.c:${ASM_PICKUPS_TAG}"
418+
"wolfcrypt/src/sp_armthumb.c:${ASM_PICKUPS_TAG}"
419+
"wolfcrypt/src/sp_c32.c:${ASM_PICKUPS_TAG}"
420+
"wolfcrypt/src/sp_c64.c:${ASM_PICKUPS_TAG}"
421+
"wolfcrypt/src/sp_cortexm.c:${ASM_PICKUPS_TAG}"
422+
"wolfcrypt/src/sp_x86_64_asm.asm:${WOLF_REPO_TAG}"
423+
"wolfcrypt/src/sp_x86_64_asm.S:${WOLF_REPO_TAG}"
424+
"wolfcrypt/src/sp_x86_64.c:${ASM_PICKUPS_TAG}"
425+
"wolfcrypt/src/port/arm/thumb2-aes-asm_c.c:${WOLF_REPO_TAG}"
426+
"wolfcrypt/src/port/arm/thumb2-aes-asm.S:${WOLF_REPO_TAG}"
427+
"wolfcrypt/src/port/arm/thumb2-sha256-asm_c.c:${WOLF_REPO_TAG}"
428+
"wolfcrypt/src/port/arm/thumb2-sha256-asm.S:${WOLF_REPO_TAG}"
429+
"wolfcrypt/src/port/arm/thumb2-sha3-asm_c.c:${WOLF_REPO_TAG}"
430+
"wolfcrypt/src/port/arm/thumb2-sha3-asm.S:${WOLF_REPO_TAG}"
431+
"wolfcrypt/src/port/arm/thumb2-sha512-asm_c.c:${WOLF_REPO_TAG}"
432+
"wolfcrypt/src/port/arm/thumb2-sha512-asm.S:${WOLF_REPO_TAG}"
433+
"wolfssl/wolfcrypt/aes.h:${WOLF_REPO_TAG}"
434+
"wolfssl/wolfcrypt/cmac.h:${WOLF_REPO_TAG}"
435+
"wolfssl/wolfcrypt/dh.h:${WOLF_REPO_TAG}"
436+
"wolfssl/wolfcrypt/ecc.h:${WOLF_REPO_TAG}"
437+
"wolfssl/wolfcrypt/ed25519.h:${WOLF_REPO_TAG}"
438+
"wolfssl/wolfcrypt/ed448.h:${WOLF_REPO_TAG}"
439+
"wolfssl/wolfcrypt/fips_test.h:${WOLF_REPO_TAG}"
440+
"wolfssl/wolfcrypt/hmac.h:${WOLF_REPO_TAG}"
441+
"wolfssl/wolfcrypt/kdf.h:${WOLF_REPO_TAG}"
442+
"wolfssl/wolfcrypt/pwdbased.h:${WOLF_REPO_TAG}"
443+
"wolfssl/wolfcrypt/random.h:${WOLF_ENTROPY_TAG}"
444+
"wolfssl/wolfcrypt/rsa.h:${WOLF_REPO_TAG}"
445+
"wolfssl/wolfcrypt/sha.h:${WOLF_REPO_TAG}"
446+
"wolfssl/wolfcrypt/sha256.h:${WOLF_REPO_TAG}"
447+
"wolfssl/wolfcrypt/sha3.h:${WOLF_REPO_TAG}"
448+
"wolfssl/wolfcrypt/sha512.h:${WOLF_REPO_TAG}"
449+
"wolfcrypt/src/port/riscv/riscv-64-sha256.c:${WOLF_REPO_TAG}"
450+
"wolfcrypt/src/port/riscv/riscv-64-sha3.c:${WOLF_REPO_TAG}"
451+
"wolfcrypt/src/port/riscv/riscv-64-sha512.c:${WOLF_REPO_TAG}"
396452
)
397453
;;
398454

0 commit comments

Comments
 (0)