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

20250122-enable-fips-requires-arg #8368

Merged
merged 2 commits into from
Jan 22, 2025
Merged

20250122-enable-fips-requires-arg #8368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6102daf
configure.ac: require explicit arg for --enable-fips.
douzzer Jan 22, 2025
bcdfc57
wolfssl/ssl.h: fix speling erorr (thanks codespell).
douzzer Jan 22, 2025
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
5 changes: 3 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ AS_CASE([$ENABLED_FIPS],
FIPS_VERSION="disabled"
ENABLED_FIPS="no"
],
[v1|yes|cert2425],[
[v1|cert2425],[
FIPS_VERSION="v1"
HAVE_FIPS_VERSION_MAJOR=1
ENABLED_FIPS="yes"
Expand Down Expand Up @@ -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)
],
[
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"
Expand Down
2 changes: 1 addition & 1 deletion wolfssl/ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2980,7 +2980,7 @@ enum { /* ssl Constants */
/* Operation did not complete; callback needs this API to be called again.*/
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,

/* The connection has been closed with a closure alert.*/
Expand Down
Loading