Merge pull request #9105 from douzzer/20250815-dilithium-dilithium_expand_s-UndefinedBinaryOperatorResult

20250815-dilithium-dilithium_expand_s-UndefinedBinaryOperatorResult

Author: dgarske

wolfcrypt/src/dilithium.c

@@ -4020,30 +4020,37 @@ static int dilithium_expand_s(wc_Shake* shake256, byte* priv_seed, byte eta,
     int ret = 0;
 
 #if defined(USE_INTEL_SPEEDUP) && !defined(WC_SHA3_NO_ASM)
-    if (IS_INTEL_AVX2(cpuid_flags) && (SAVE_VECTOR_REGISTERS2() == 0)) {
-
     #ifndef WOLFSSL_NO_ML_DSA_44
-        if (s1Len == 4) {
-            sword32* s[2] = { s1, s2 };
-            ret = wc_mldsa_gen_s_4_4_avx2(s, priv_seed);
-        }
+    if ((s1Len == 4) && IS_INTEL_AVX2(cpuid_flags) &&
+        (SAVE_VECTOR_REGISTERS2() == 0))
+    {
+        sword32* s[2] = { s1, s2 };
+        ret = wc_mldsa_gen_s_4_4_avx2(s, priv_seed);
+        RESTORE_VECTOR_REGISTERS();
+    }
+    else
     #endif
     #ifndef WOLFSSL_NO_ML_DSA_65
-        if (s1Len == 5) {
-            sword32* s[2] = { s1, s2 };
-            ret = wc_mldsa_gen_s_5_6_avx2(s, priv_seed);
-        }
+    if ((s1Len == 5) && IS_INTEL_AVX2(cpuid_flags) &&
+        (SAVE_VECTOR_REGISTERS2() == 0))
+    {
+        sword32* s[2] = { s1, s2 };
+        ret = wc_mldsa_gen_s_5_6_avx2(s, priv_seed);
+        RESTORE_VECTOR_REGISTERS();
+    }
+    else
     #endif
     #ifndef WOLFSSL_NO_ML_DSA_87
-        if (s1Len == 7) {
-            sword32* s[2] = { s1, s2 };
-            ret = wc_mldsa_gen_s_7_8_avx2(s, priv_seed);
-        }
-    #endif
+    if ((s1Len == 7) && IS_INTEL_AVX2(cpuid_flags) &&
+        (SAVE_VECTOR_REGISTERS2() == 0))
+    {
+        sword32* s[2] = { s1, s2 };
+        ret = wc_mldsa_gen_s_7_8_avx2(s, priv_seed);
         RESTORE_VECTOR_REGISTERS();
     }
     else
-#endif
+    #endif
+#endif /* USE_INTEL_SPEEDUP && !WC_SHA3_NO_ASM */
     {
         ret = dilithium_expand_s_c(shake256, priv_seed, eta, s1, s1Len, s2,
             s2Len);