feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Update

Browse Source 
1. WIN10 FIPS build should use version 5,2 now.
2. Update the v5-ready build ot use version 5,2.
3. Remove eol-whitespace from the benchmark source.
This commit is contained in:
John Safranek
2021-11-17 09:19:34 -08:00
parent c7c682ba2a
commit ef62fab4ea
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IDE/WIN10/user_settings.h
View File

@ -15,7 +15,7 @@
#undef HAVE_FIPS_VERSION #undef HAVE_FIPS_VERSION
#define HAVE_FIPS_VERSION 5 #define HAVE_FIPS_VERSION 5
#undef HAVE_FIPS_VERSION_MINOR #undef HAVE_FIPS_VERSION_MINOR
#define HAVE_FIPS_VERSION_MINOR 1 #define HAVE_FIPS_VERSION_MINOR 2
#endif #endif

2
configure.ac
View File

@ -269,7 +269,7 @@ AS_CASE([$ENABLED_FIPS],
[ready|v5-ready],[ [ready|v5-ready],[
FIPS_VERSION="v5-ready" FIPS_VERSION="v5-ready"
HAVE_FIPS_VERSION=5 HAVE_FIPS_VERSION=5
HAVE_FIPS_VERSION_MINOR=1 HAVE_FIPS_VERSION_MINOR=2
ENABLED_FIPS="yes" ENABLED_FIPS="yes"
], ],
[ [

2
wolfcrypt/benchmark/benchmark.c
View File

@ -1825,7 +1825,7 @@ static void* benchmarks_do(void* args)
#ifdef WOLFSSL_KEY_GEN #ifdef WOLFSSL_KEY_GEN
if (bench_all || (bench_asym_algs & BENCH_RSA_KEYGEN)) { if (bench_all || (bench_asym_algs & BENCH_RSA_KEYGEN)) {
#ifndef NO_SW_BENCH #ifndef NO_SW_BENCH
if (((word32)bench_asym_algs == 0xFFFFFFFFU) || if (((word32)bench_asym_algs == 0xFFFFFFFFU) ||
(bench_asym_algs & BENCH_RSA_SZ) == 0) { (bench_asym_algs & BENCH_RSA_SZ) == 0) {
bench_rsaKeyGen(0); bench_rsaKeyGen(0);
} }