Skip to content

FIPS 140-3 Pilot Program Check-in#6751

Merged
JacobBarthelmeh merged 7 commits intowolfSSL:masterfrom
ejohnstown:merge-fips-builds
Sep 6, 2023
Merged

FIPS 140-3 Pilot Program Check-in#6751
JacobBarthelmeh merged 7 commits intowolfSSL:masterfrom
ejohnstown:merge-fips-builds

Conversation

@ejohnstown
Copy link
Copy Markdown
Contributor

Description

Check-in FIPS 140-3 PILOT

Testing

Normal build testing. Copied over the updated files from the fips repo.

Checklist

  • added tests
  • updated/added doxygen
  • updated appropriate READMEs
  • Updated manual and documentation

kaleb-himes
kaleb-himes previously approved these changes Sep 5, 2023
Copy link
Copy Markdown
Contributor

@kaleb-himes kaleb-himes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logic remains in-tact, good sync. Thank you @ejohnstown

douzzer
douzzer previously approved these changes Sep 6, 2023
Copy link
Copy Markdown
Contributor

@douzzer douzzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. In combo with https://github.com/wolfSSL/fips/pull/228 at 9dea8271c0ce, this is now passing:

cross-aarch64-armasm-fips-140-3-dev-all-unittest-sanitizer
cross-armv7a-all-armasm-testsuite
cross-armv6zk-thumb-all-asm
cross-aarch64-all-armasm-unittest-sanitizer
clang-tidy-fips-140-3-dev-defaults
clang-tidy-fips-140-3-dev-all
fips-140-3-dev-optest-acvp-sp-asm-gcc-latest
fips-140-3-dev-all linuxkm-all-fips-140-3-dev-dyn-hash
sp-all-asm-smallstack-sanitizer-fips-140-3-dev
linuxkm-all-fips-140-3-dev-dyn-hash
check-file-modes
check-source-text
check-shell-scripts
check-configure

@JacobBarthelmeh
Copy link
Copy Markdown
Contributor

JacobBarthelmeh commented Sep 6, 2023

One of the automated tests needs investigation.

--enable-singlethreaded --disable-fastmath --enable-smallstack --enable-smallstackcache  --disable-shared --enable-static

==24183== 256 bytes in 1 blocks are definitely lost in loss record 2 of 30
==24183==    by 0x12EAF6: Transform_Sha256 (sha256.c:886)
==24183==    by 0x12EC74: Sha256Update (sha256.c:1161)
==24183==    by 0x12EC74: Sha256Update (sha256.c:1016)
==24183==    by 0x12EC74: wc_Sha256Update (sha256.c:1213)
==24183==    by 0x129B98: HmacKeyInnerHash (hmac.c:595)
==24183==    by 0x129DFC: wc_HmacUpdate (hmac.c:689)
==24183==    by 0x12B224: wc_HKDF_Expand (hmac.c:1308)
==24183==    by 0x12B495: wc_HKDF (hmac.c:1369)
==24183==    by 0x11E462: hkdf_test (test.c:23124)
==24183==    by 0x120B76: wolfcrypt_test (test.c:1251)
==24183==    by 0x10D958: main (testsuite.c:659)

@kaleb-himes
Copy link
Copy Markdown
Contributor

retest this please

JacobBarthelmeh
JacobBarthelmeh previously approved these changes Sep 6, 2023
…k buffers before freeing them, and ForceZero() the Hmac, wc_Sha512, wc_Sha384, wc_Sha256, and wc_Sha224 structures at the end of their respective freeing routines. also, remove superseded ForceZero() calls in wc_HKDF_Expand(), wc_SSH_KDF(), and wc_HKDF_Extract().
@JacobBarthelmeh JacobBarthelmeh merged commit 755c39b into wolfSSL:master Sep 6, 2023
@ejohnstown ejohnstown deleted the merge-fips-builds branch September 7, 2023 00:37
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.

5 participants