Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2615,7 +2615,8 @@ do
done

if test "$ENABLED_MLDSA_NO_CTX" = "yes" && test "$ENABLED_FIPS" != "no" && \
test "$HAVE_FIPS_VERSION" -ge 7
test "$HAVE_FIPS_VERSION" -ge 7 && (test "$ENABLED_FIPS_DEV" != "yes" || \
test "$ENABLED_EXPERIMENTAL" != "yes")
then
AC_MSG_ERROR([ML-DSA no-ctx and draft are not in the FIPS module boundary: drop them from --enable-mldsa (or --enable-dilithium) in a FIPS v7 or later build.])
fi
Expand Down Expand Up @@ -4587,6 +4588,7 @@ then
fi

if test "$ENABLED_FIPS" != "no" && test "$HAVE_FIPS_VERSION" -ge 7 && \
test "$ENABLED_FIPS_DEV" != "yes" && \
{ test "$ENABLED_AESSIV" = "yes" || test "$ENABLED_AESEAX" = "yes"; }
then
AC_MSG_ERROR([AES-SIV and AES-EAX are not in the FIPS module boundary: drop --enable-aessiv, --enable-aeseax, --enable-chrony or --enable-all-nonfips-crypto from a FIPS v7 build.])
Expand Down Expand Up @@ -7860,6 +7862,7 @@ do
done

if test "$ENABLED_FIPS" != "no" && test "$HAVE_FIPS_VERSION" -ge 7 && \
test "$ENABLED_FIPS_DEV" != "yes" && \
{ test "$ENABLED_AESGCMSIV" = "yes" || test "$ENABLED_AESCTS" = "yes" || \
test "$ENABLED_AESKEYWRAP_PADDING" = "yes"; }
then
Expand Down
2 changes: 1 addition & 1 deletion wolfcrypt/src/aes.c
Original file line number Diff line number Diff line change
Expand Up @@ -21059,7 +21059,7 @@ int wc_local_CmacUpdateAes(struct Cmac *cmac, const byte* in, word32 inSz) {
#endif /* WOLFSSL_CMAC */

/* AES-SIV, EAX, GCM-SIV, CTS and KWP are kept out of the FIPS image. */
#if FIPS_VERSION3_GE(7,0,0) && \
#if FIPS_VERSION3_GE(7,0,0) && !defined(WOLFSSL_FIPS_DEV) && \
(defined(WOLFSSL_AES_SIV) || defined(WOLFSSL_AES_EAX) || \
defined(WOLFSSL_AESGCM_SIV) || defined(WOLFSSL_AES_CTS) || \
defined(WOLFSSL_AES_KEYWRAP_PADDING))
Expand Down
1 change: 1 addition & 0 deletions wolfssl/wolfcrypt/wc_mldsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@

/* The pre-FIPS 204 no-context API is not in the FIPS module boundary. */
#if defined(HAVE_FIPS) && FIPS_VERSION3_GE(7,0,0) && \
!(defined(WOLFSSL_FIPS_DEV) && defined(WOLFSSL_EXPERIMENTAL_SETTINGS)) && \
(defined(WOLFSSL_MLDSA_NO_CTX) || defined(WOLFSSL_MLDSA_FIPS204_DRAFT))
#error "WOLFSSL_MLDSA_NO_CTX or WOLFSSL_MLDSA_FIPS204_DRAFT is not allowed in FIPS v7 or later."
#endif
Expand Down
Loading