Merge pull request #8378 from douzzer/20250125-fips204-fixes

20250125-fips204-fixes
This commit is contained in:
David Garske
2025-01-25 08:48:14 -08:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@ -6965,8 +6965,8 @@ static int check_cert_key_dev(word32 keyOID, byte* privKey, word32 privSz,
(keyOID == ML_DSA_LEVEL3k) ||
(keyOID == ML_DSA_LEVEL5k)
#ifdef WOLFSSL_DILITHIUM_FIPS204_DRAFT
|| (keyOID == DILITHIUM_LEVEL2k) ||
|| (keyOID == DILITHIUM_LEVEL3k) ||
|| (keyOID == DILITHIUM_LEVEL2k)
|| (keyOID == DILITHIUM_LEVEL3k)
|| (keyOID == DILITHIUM_LEVEL5k)
#endif /* WOLFSSL_DILITHIUM_FIPS204_DRAFT */
) {

View File

@ -1184,8 +1184,8 @@ static int ProcessBufferTryDecode(WOLFSSL_CTX* ctx, WOLFSSL* ssl,
(*keyFormat == ML_DSA_LEVEL3k) ||
(*keyFormat == ML_DSA_LEVEL5k)
#ifdef WOLFSSL_DILITHIUM_FIPS204_DRAFT
|| (*keyFormat == DILITHIUM_LEVEL2k) ||
|| (*keyFormat == DILITHIUM_LEVEL3k) ||
|| (*keyFormat == DILITHIUM_LEVEL2k)
|| (*keyFormat == DILITHIUM_LEVEL3k)
|| (*keyFormat == DILITHIUM_LEVEL5k)
#endif
)) {