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

20250125-fips204-fixes
rlm2002 · Jan 25, 2025 · 3379328 · 3379328
2 parents 0932891 + b41d46a
commit 3379328
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ssl.c b/src/ssl.c
@@ -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 */
             ) {

diff --git a/src/ssl_load.c b/src/ssl_load.c
@@ -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
         )) {