Merge pull request #4577 from kaleb-himes/WINDOWS_AES_OFB_ON

Turn on AES-OFB mode in windows for FIPS=v5
This commit is contained in:
David Garske
2021-11-17 12:20:19 -08:00
committed by GitHub
3 changed files with 4 additions and 3 deletions

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
@ -98,6 +98,7 @@
#define HAVE_FFDHE_4096 #define HAVE_FFDHE_4096
#define HAVE_FFDHE_6144 #define HAVE_FFDHE_6144
#define HAVE_FFDHE_8192 #define HAVE_FFDHE_8192
#define WOLFSSL_AES_OFB
#define FP_MAX_BITS 16384 #define FP_MAX_BITS 16384
#endif /* FIPS v5 */ #endif /* FIPS v5 */
#else #else

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"
], ],
[ [

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);
} }