Skip to content

FIPS Check Update#6674

Merged
JacobBarthelmeh merged 4 commits intowolfSSL:masterfrom
ejohnstown:fips-check-update
Aug 8, 2023
Merged

FIPS Check Update#6674
JacobBarthelmeh merged 4 commits intowolfSSL:masterfrom
ejohnstown:fips-check-update

Conversation

@ejohnstown
Copy link
Copy Markdown
Contributor

Description

  1. Whitespace changes.
  2. Deleted the stm32l4 build. The fips-check-2.0.sh script handles it.
  3. Removed the CAVP_SELFTEST_* variables, used the FIPS_OPTIONS for it.
  4. Removed the v1 style code checkout. The current method works for all available cases.
  5. Removed the FIPS_CONFLICTS case rename case.

Testing

Kept a copy of the previous fips-check.sh script pre-byebyecyassl named orig-fips-check.sh. I wrote a script that called both orig-fips-check.sh and this version (which uses a different output directory), and then did a file compare between the wolfcrypt source and header files. I logged the output of the diff. The goal was to have absolutely no changes.

Checklist

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

1. Whitespace changes.
2. Deleted the stm32l4 build. The fips-check-2.0.sh script handles it.
3. Removed the CAVP_SELFTEST_* variables, used the FIPS_OPTIONS for it.
4. Removed the v1 style code checkout. The current method works for all
   available cases.
5. Removed the FIPS_CONFLICTS case rename case.
@ejohnstown
Copy link
Copy Markdown
Contributor Author

This change is intended to make my next change easier. For each build, the files are going to be listed explicitly in tuples with the file revision to be checked out.

douzzer
douzzer previously approved these changes Aug 4, 2023
Comment thread fips-check.sh Outdated

if [ "$1" == "" ]; then FLAVOR="undef"; else FLAVOR="$1"; fi
while [ "x$1" != 'x' ]; do
if [ "x$1" = 'xkeep' ]; then KEEP='yes'; else FLAVOR="$1"; fi
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

shellcheck says

In fips-check.sh line 42:
  if [ "x$1" = 'xkeep' ]; then KEEP='yes'; else FLAVOR="$1"; fi
       ^---^ SC2268 (style): Avoid x-prefix in comparisons as it no longer serves a purpose.

@ejohnstown
Copy link
Copy Markdown
Contributor Author

Here's a link to my check script. https://gist.github.com/ejohnstown/0fee1429ef43bb515104e2894940a5f7

@douzzer
Copy link
Copy Markdown
Contributor

douzzer commented Aug 7, 2023

retest this please.

@ejohnstown
Copy link
Copy Markdown
Contributor Author

retest this please

@JacobBarthelmeh JacobBarthelmeh merged commit e9e5d70 into wolfSSL:master Aug 8, 2023
@ejohnstown ejohnstown deleted the fips-check-update branch August 16, 2023 15:59
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