wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8368 from douzzer/20250122-enable-fips-requires-arg

Browse Source 
20250122-enable-fips-requires-arg
This commit is contained in:
Kaleb Himes
2025-01-22 12:49:11 -07:00
committed by GitHub
parent 1729d03123 bcdfc5791c
commit dd2c5b1a4c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -423,7 +423,7 @@ AS_CASE([$ENABLED_FIPS],
FIPS_VERSION="disabled" FIPS_VERSION="disabled"
ENABLED_FIPS="no" ENABLED_FIPS="no"
], ],
[v1|yes|cert2425],[ [v1|cert2425],[
FIPS_VERSION="v1" FIPS_VERSION="v1"
HAVE_FIPS_VERSION_MAJOR=1 HAVE_FIPS_VERSION_MAJOR=1
ENABLED_FIPS="yes" ENABLED_FIPS="yes"
@@ -510,7 +510,8 @@ AS_CASE([$ENABLED_FIPS],
# for dev, DEF_SP_MATH and DEF_FAST_MATH follow non-FIPS defaults (currently sp-math-all) # for dev, DEF_SP_MATH and DEF_FAST_MATH follow non-FIPS defaults (currently sp-math-all)
], ],
[ [
AC_MSG_ERROR([Invalid value for --enable-fips "$ENABLED_FIPS" (main options: v1, v2, v5, v6, ready, dev, rand, no, disabled)]) AS_IF([test "$ENABLED_FIPS" = "yes"],[ENABLED_FIPS="(unset)"],[ENABLED_FIPS=\"$ENABLED_FIPS\"])
AC_MSG_ERROR([Invalid value for --enable-fips $ENABLED_FIPS (main options: v1, v2, v5, v6, ready, dev, rand, no, disabled)])
]) ])
if test -z "$HAVE_FIPS_VERSION_MAJOR" if test -z "$HAVE_FIPS_VERSION_MAJOR"

2
wolfssl/ssl.h
View File

@@ -2980,7 +2980,7 @@ enum { /* ssl Constants */
/* Operation did not complete; callback needs this API to be called again.*/ /* Operation did not complete; callback needs this API to be called again.*/
WOLFSSL_ERROR_WANT_X509_LOOKUP = 4, WOLFSSL_ERROR_WANT_X509_LOOKUP = 4,
/* Some sort of sytem I/O error happened.*/ /* Some sort of system I/O error happened.*/
WOLFSSL_ERROR_SYSCALL = 5, WOLFSSL_ERROR_SYSCALL = 5,
/* The connection has been closed with a closure alert.*/ /* The connection has been closed with a closure alert.*/