diff --git a/wolfcrypt/src/sp_c32.c b/wolfcrypt/src/sp_c32.c
index 021cff7c9..982446e33 100644
--- a/wolfcrypt/src/sp_c32.c
+++ b/wolfcrypt/src/sp_c32.c
@@ -12718,26 +12718,26 @@ static int sp_256_mod_mul_norm_10(sp_digit* r, const sp_digit* a, const sp_digit
 
         r[0] = (sp_digit)(t[0]) & 0x3ffffffL;
         r[1] = (sp_digit)(t[0] >> 26U);
-        r[1] |= (sp_digit)t[1] << 6U;
+        r[1] |= (sp_digit)(t[1] << 6U);
         r[1] &= 0x3ffffffL;
         r[2] = (sp_digit)(t[1] >> 20U);
-        r[2] |= (sp_digit)t[2] << 12U;
+        r[2] |= (sp_digit)(t[2] << 12U);
         r[2] &= 0x3ffffffL;
         r[3] = (sp_digit)(t[2] >> 14U);
-        r[3] |= (sp_digit)t[3] << 18U;
+        r[3] |= (sp_digit)(t[3] << 18U);
         r[3] &= 0x3ffffffL;
         r[4] = (sp_digit)(t[3] >> 8U);
-        r[4] |= (sp_digit)t[4] << 24U;
+        r[4] |= (sp_digit)(t[4] << 24U);
         r[4] &= 0x3ffffffL;
         r[5] = (sp_digit)(t[4] >> 2U) & 0x3ffffffL;
         r[6] = (sp_digit)(t[4] >> 28U);
-        r[6] |= (sp_digit)t[5] << 4U;
+        r[6] |= (sp_digit)(t[5] << 4U);
         r[6] &= 0x3ffffffL;
         r[7] = (sp_digit)(t[5] >> 22U);
-        r[7] |= (sp_digit)t[6] << 10U;
+        r[7] |= (sp_digit)(t[6] << 10U);
         r[7] &= 0x3ffffffL;
         r[8] = (sp_digit)(t[6] >> 16U);
-        r[8] |= (sp_digit)t[7] << 16U;
+        r[8] |= (sp_digit)(t[7] << 16U);
         r[8] &= 0x3ffffffL;
         r[9] = (sp_digit)(t[7] >> 10U);
     }
@@ -19221,39 +19221,39 @@ static int sp_384_mod_mul_norm_15(sp_digit* r, const sp_digit* a, const sp_digit
 
         r[0] = (sp_digit)(t[0]) & 0x3ffffffL;
         r[1] = (sp_digit)(t[0] >> 26U);
-        r[1] |= (sp_digit)t[1] << 6U;
+        r[1] |= (sp_digit)(t[1] << 6U);
         r[1] &= 0x3ffffffL;
         r[2] = (sp_digit)(t[1] >> 20U);
-        r[2] |= (sp_digit)t[2] << 12U;
+        r[2] |= (sp_digit)(t[2] << 12U);
         r[2] &= 0x3ffffffL;
         r[3] = (sp_digit)(t[2] >> 14U);
-        r[3] |= (sp_digit)t[3] << 18U;
+        r[3] |= (sp_digit)(t[3] << 18U);
         r[3] &= 0x3ffffffL;
         r[4] = (sp_digit)(t[3] >> 8U);
-        r[4] |= (sp_digit)t[4] << 24U;
+        r[4] |= (sp_digit)(t[4] << 24U);
         r[4] &= 0x3ffffffL;
         r[5] = (sp_digit)(t[4] >> 2U) & 0x3ffffffL;
         r[6] = (sp_digit)(t[4] >> 28U);
-        r[6] |= (sp_digit)t[5] << 4U;
+        r[6] |= (sp_digit)(t[5] << 4U);
         r[6] &= 0x3ffffffL;
         r[7] = (sp_digit)(t[5] >> 22U);
-        r[7] |= (sp_digit)t[6] << 10U;
+        r[7] |= (sp_digit)(t[6] << 10U);
         r[7] &= 0x3ffffffL;
         r[8] = (sp_digit)(t[6] >> 16U);
-        r[8] |= (sp_digit)t[7] << 16U;
+        r[8] |= (sp_digit)(t[7] << 16U);
         r[8] &= 0x3ffffffL;
         r[9] = (sp_digit)(t[7] >> 10U);
-        r[9] |= (sp_digit)t[8] << 22U;
+        r[9] |= (sp_digit)(t[8] << 22U);
         r[9] &= 0x3ffffffL;
         r[10] = (sp_digit)(t[8] >> 4U) & 0x3ffffffL;
         r[11] = (sp_digit)(t[8] >> 30U);
-        r[11] |= (sp_digit)t[9] << 2U;
+        r[11] |= (sp_digit)(t[9] << 2U);
         r[11] &= 0x3ffffffL;
         r[12] = (sp_digit)(t[9] >> 24U);
-        r[12] |= (sp_digit)t[10] << 8U;
+        r[12] |= (sp_digit)(t[10] << 8U);
         r[12] &= 0x3ffffffL;
         r[13] = (sp_digit)(t[10] >> 18U);
-        r[13] |= (sp_digit)t[11] << 14U;
+        r[13] |= (sp_digit)(t[11] << 14U);
         r[13] &= 0x3ffffffL;
         r[14] = (sp_digit)(t[11] >> 12U);
     }
diff --git a/wolfcrypt/src/sp_c64.c b/wolfcrypt/src/sp_c64.c
index 999a4b9e6..dd62d8315 100644
--- a/wolfcrypt/src/sp_c64.c
+++ b/wolfcrypt/src/sp_c64.c
@@ -12689,18 +12689,18 @@ static int sp_256_mod_mul_norm_5(sp_digit* r, const sp_digit* a, const sp_digit*
 
         a32[0] = (sp_digit)(a[0]) & 0xffffffffL;
         a32[1] = (sp_digit)(a[0] >> 32U);
-        a32[1] |= (sp_digit)a[1] << 20U;
+        a32[1] |= (sp_digit)(a[1] << 20U);
         a32[1] &= 0xffffffffL;
         a32[2] = (sp_digit)(a[1] >> 12U) & 0xffffffffL;
         a32[3] = (sp_digit)(a[1] >> 44U);
-        a32[3] |= (sp_digit)a[2] << 8U;
+        a32[3] |= (sp_digit)(a[2] << 8U);
         a32[3] &= 0xffffffffL;
         a32[4] = (sp_digit)(a[2] >> 24U);
-        a32[4] |= (sp_digit)a[3] << 28U;
+        a32[4] |= (sp_digit)(a[3] << 28U);
         a32[4] &= 0xffffffffL;
         a32[5] = (sp_digit)(a[3] >> 4U) & 0xffffffffL;
         a32[6] = (sp_digit)(a[3] >> 36U);
-        a32[6] |= (sp_digit)a[4] << 16U;
+        a32[6] |= (sp_digit)(a[4] << 16U);
         a32[6] &= 0xffffffffL;
         a32[7] = (sp_digit)(a[4] >> 16U) & 0xffffffffL;
 
@@ -18856,26 +18856,26 @@ static int sp_384_mod_mul_norm_7(sp_digit* r, const sp_digit* a, const sp_digit*
 
         a32[0] = (sp_digit)(a[0]) & 0xffffffffL;
         a32[1] = (sp_digit)(a[0] >> 32U);
-        a32[1] |= (sp_digit)a[1] << 23U;
+        a32[1] |= (sp_digit)(a[1] << 23U);
         a32[1] &= 0xffffffffL;
         a32[2] = (sp_digit)(a[1] >> 9U) & 0xffffffffL;
         a32[3] = (sp_digit)(a[1] >> 41U);
-        a32[3] |= (sp_digit)a[2] << 14U;
+        a32[3] |= (sp_digit)(a[2] << 14U);
         a32[3] &= 0xffffffffL;
         a32[4] = (sp_digit)(a[2] >> 18U) & 0xffffffffL;
         a32[5] = (sp_digit)(a[2] >> 50U);
-        a32[5] |= (sp_digit)a[3] << 5U;
+        a32[5] |= (sp_digit)(a[3] << 5U);
         a32[5] &= 0xffffffffL;
         a32[6] = (sp_digit)(a[3] >> 27U);
-        a32[6] |= (sp_digit)a[4] << 28U;
+        a32[6] |= (sp_digit)(a[4] << 28U);
         a32[6] &= 0xffffffffL;
         a32[7] = (sp_digit)(a[4] >> 4U) & 0xffffffffL;
         a32[8] = (sp_digit)(a[4] >> 36U);
-        a32[8] |= (sp_digit)a[5] << 19U;
+        a32[8] |= (sp_digit)(a[5] << 19U);
         a32[8] &= 0xffffffffL;
         a32[9] = (sp_digit)(a[5] >> 13U) & 0xffffffffL;
         a32[10] = (sp_digit)(a[5] >> 45U);
-        a32[10] |= (sp_digit)a[6] << 10U;
+        a32[10] |= (sp_digit)(a[6] << 10U);
         a32[10] &= 0xffffffffL;
         a32[11] = (sp_digit)(a[6] >> 22U) & 0xffffffffL;