Merge branch 'master' of github.com:wolfssl/wolfssl into OE33_NON_FIPS_CHANGES

This commit is contained in:
kaleb-himes
2021-11-17 14:02:56 -07:00
3 changed files with 4 additions and 3 deletions

View File

@ -15,7 +15,7 @@
#undef HAVE_FIPS_VERSION
#define HAVE_FIPS_VERSION 5
#undef HAVE_FIPS_VERSION_MINOR
#define HAVE_FIPS_VERSION_MINOR 1
#define HAVE_FIPS_VERSION_MINOR 2
#endif
@ -98,6 +98,7 @@
#define HAVE_FFDHE_4096
#define HAVE_FFDHE_6144
#define HAVE_FFDHE_8192
#define WOLFSSL_AES_OFB
#define FP_MAX_BITS 16384
#endif /* FIPS v5 */
#else

View File

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