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.

Sign up for GitHub

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

Jump to bottom

Fix benchmark failure on FIPS builds #6623

Merged
merged 3 commits into from
May 20, 2024
Merged

Fix benchmark failure on FIPS builds #6623

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fa8388
fixed bug where tls_bench failed KATs for FIPS builds in a multithrea…
bigbrett Jul 14, 2023
e823da9
declare loop variable at top of function body
bigbrett Jul 20, 2023
c6db51b
fixed formatting
bigbrett May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions examples/benchmark/tls_bench.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,32 @@ char* myoptarg = NULL;
int DoneHandShake = 0;
#endif


#if defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION == 5)
static int run_all_CAST(void)
{
int ret = 0;
int cast_idx = 0;

for (cast_idx=0; cast_idx<FIPS_CAST_COUNT; cast_idx++) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should have spaces around '=' and '<'.

Copy link
Contributor

Choose a reason for hiding this comment

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

@bigbrett please fix. Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed in latest commit. @dgarske thank you for bringing this PR back from the dead!!

if ((ret = wc_RunCast_fips(cast_idx)) != 0) {
#ifdef NO_ERROR_STRINGS
fprintf(stderr,
"ERROR: FIPS CAST failed with return code: %d\n", ret);
#else
fprintf(stderr,
"ERROR: FIPS CAST failed for algorithm: %s\n",
wc_GetErrorString(ret));
#endif
return ret;
}
}

return ret;
}
#endif /* HAVE_FIPS && HAVE_FIPS_VERSION == 5 */


static double gettime_secs(int reset)
{
struct timeval tv;
Expand Down Expand Up @@ -1863,6 +1889,23 @@ int bench_tls(void* args)
/* Initialize wolfSSL */
wolfSSL_Init();

#if defined(HAVE_FIPS) && defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION == 5)
/*
* When running benchmarks on FIPS builds, we need to run ALL CASTs up
* front before spawning client/server threads, otherwise there is the
* possibility that both threads try to run a CAST at the same time during
* the handshake. In this scenario, the thread that doesn't win the race
* will not be able to run the CAST, since it returns "busy", which is treated
* as a failure. Running the CASTs up front is a simpler solution than
* implementing an additional layer of synchronization.
*/
if ((ret = run_all_CAST()) != 0)
{
fprintf(stderr, "CAST failed. Exiting benchmark\n");
goto exit;
}
#endif /* HAVE_FIPS && HAVE_FIPS_VERSION == 5 */

/* Parse command line arguments */
while ((ch = mygetopt(argc, argv, "?" "udeil:p:t:vT:sch:P:mS:g")) != -1) {
switch (ch) {
Expand Down