Skip to content

Fix for implicit conversion with 32-bit in SP math #5865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SparkiDev merged 1 commit into from
Dec 8, 2022
Merged

Fix for implicit conversion with 32-bit in SP math #5865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions wolfcrypt/src/sp_c32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ SP_NOINLINE static void sp_2048_mul_12(sp_digit* r, const sp_digit* a,
t0 = ((sp_uint64)a[11]) * b[11];
r[21] = t1 & 0x1fffffff; t0 += t1 >> 29;
r[22] = t0 & 0x1fffffff;
r[23] = t0 >> 29;
r[23] = (sp_digit)(t0 >> 29);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -954,7 +954,7 @@ SP_NOINLINE static void sp_2048_sqr_12(sp_digit* r, const sp_digit* a)
t0 = ((sp_uint64)a[11]) * a[11];
r[21] = t1 & 0x1fffffff; t0 += t1 >> 29;
r[22] = t0 & 0x1fffffff;
r[23] = t0 >> 29;
r[23] = (sp_digit)(t0 >> 29);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -8661,7 +8661,7 @@ SP_NOINLINE static void sp_3072_mul_14(sp_digit* r, const sp_digit* a,
t0 = ((sp_uint64)a[13]) * b[13];
r[25] = t1 & 0xfffffff; t0 += t1 >> 28;
r[26] = t0 & 0xfffffff;
r[27] = t0 >> 28;
r[27] = (sp_digit)(t0 >> 28);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -9143,7 +9143,7 @@ SP_NOINLINE static void sp_3072_sqr_14(sp_digit* r, const sp_digit* a)
t0 = ((sp_uint64)a[13]) * a[13];
r[25] = t1 & 0xfffffff; t0 += t1 >> 28;
r[26] = t0 & 0xfffffff;
r[27] = t0 >> 28;
r[27] = (sp_digit)(t0 >> 28);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -16041,7 +16041,7 @@ SP_NOINLINE static void sp_4096_mul_9(sp_digit* r, const sp_digit* a,
t0 = ((sp_uint64)a[ 8]) * b[ 8];
r[15] = t1 & 0x3ffffff; t0 += t1 >> 26;
r[16] = t0 & 0x3ffffff;
r[17] = t0 >> 26;
r[17] = (sp_digit)(t0 >> 26);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -16614,7 +16614,7 @@ SP_NOINLINE static void sp_4096_sqr_9(sp_digit* r, const sp_digit* a)
t0 = ((sp_uint64)a[ 8]) * a[ 8];
r[15] = t1 & 0x3ffffff; t0 += t1 >> 26;
r[16] = t0 & 0x3ffffff;
r[17] = t0 >> 26;
r[17] = (sp_digit)(t0 >> 26);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -20215,7 +20215,7 @@ SP_NOINLINE static void sp_256_mul_9(sp_digit* r, const sp_digit* a,
t0 = ((sp_int64)a[ 8]) * b[ 8];
r[15] = t1 & 0x1fffffff; t0 += t1 >> 29;
r[16] = t0 & 0x1fffffff;
r[17] = t0 >> 29;
r[17] = (sp_digit)(t0 >> 29);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -20336,7 +20336,7 @@ SP_NOINLINE static void sp_256_sqr_9(sp_digit* r, const sp_digit* a)
t0 = ((sp_int64)a[ 8]) * a[ 8];
r[15] = t1 & 0x1fffffff; t0 += t1 >> 29;
r[16] = t0 & 0x1fffffff;
r[17] = t0 >> 29;
r[17] = (sp_digit)(t0 >> 29);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -27478,7 +27478,7 @@ SP_NOINLINE static void sp_384_mul_15(sp_digit* r, const sp_digit* a,
t0 = ((sp_int64)a[14]) * b[14];
r[27] = t1 & 0x3ffffff; t0 += t1 >> 26;
r[28] = t0 & 0x3ffffff;
r[29] = t0 >> 26;
r[29] = (sp_digit)(t0 >> 26);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -27686,7 +27686,7 @@ SP_NOINLINE static void sp_384_sqr_15(sp_digit* r, const sp_digit* a)
t0 = ((sp_int64)a[14]) * a[14];
r[27] = t1 & 0x3ffffff; t0 += t1 >> 26;
r[28] = t0 & 0x3ffffff;
r[29] = t0 >> 26;
r[29] = (sp_digit)(t0 >> 26);
XMEMCPY(r, t, sizeof(t));
}

Expand Down
20 changes: 10 additions & 10 deletions wolfcrypt/src/sp_c64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3691,7 +3691,7 @@ SP_NOINLINE static void sp_2048_mul_9(sp_digit* r, const sp_digit* a,
t0 = ((sp_uint128)a[ 8]) * b[ 8];
r[15] = t1 & 0x1ffffffffffffffL; t0 += t1 >> 57;
r[16] = t0 & 0x1ffffffffffffffL;
r[17] = t0 >> 57;
r[17] = (sp_digit)(t0 >> 57);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -3950,7 +3950,7 @@ SP_NOINLINE static void sp_2048_sqr_9(sp_digit* r, const sp_digit* a)
t0 = ((sp_uint128)a[ 8]) * a[ 8];
r[15] = t1 & 0x1ffffffffffffffL; t0 += t1 >> 57;
r[16] = t0 & 0x1ffffffffffffffL;
r[17] = t0 >> 57;
r[17] = (sp_digit)(t0 >> 57);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -10577,7 +10577,7 @@ SP_NOINLINE static void sp_3072_mul_9(sp_digit* r, const sp_digit* a,
t0 = ((sp_uint128)a[ 8]) * b[ 8];
r[15] = t1 & 0x1ffffffffffffffL; t0 += t1 >> 57;
r[16] = t0 & 0x1ffffffffffffffL;
r[17] = t0 >> 57;
r[17] = (sp_digit)(t0 >> 57);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -10894,7 +10894,7 @@ SP_NOINLINE static void sp_3072_sqr_9(sp_digit* r, const sp_digit* a)
t0 = ((sp_uint128)a[ 8]) * a[ 8];
r[15] = t1 & 0x1ffffffffffffffL; t0 += t1 >> 57;
r[16] = t0 & 0x1ffffffffffffffL;
r[17] = t0 >> 57;
r[17] = (sp_digit)(t0 >> 57);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -17606,7 +17606,7 @@ SP_NOINLINE static void sp_4096_mul_13(sp_digit* r, const sp_digit* a,
t0 = ((sp_uint128)a[12]) * b[12];
r[23] = t1 & 0x1fffffffffffffL; t0 += t1 >> 53;
r[24] = t0 & 0x1fffffffffffffL;
r[25] = t0 >> 53;
r[25] = (sp_digit)(t0 >> 53);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -17985,7 +17985,7 @@ SP_NOINLINE static void sp_4096_sqr_13(sp_digit* r, const sp_digit* a)
t0 = ((sp_uint128)a[12]) * a[12];
r[23] = t1 & 0x1fffffffffffffL; t0 += t1 >> 53;
r[24] = t0 & 0x1fffffffffffffL;
r[25] = t0 >> 53;
r[25] = (sp_digit)(t0 >> 53);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -35713,7 +35713,7 @@ SP_NOINLINE static void sp_521_mul_9(sp_digit* r, const sp_digit* a,
t0 = ((sp_int128)a[ 8]) * b[ 8];
r[15] = t1 & 0x3ffffffffffffffL; t0 += t1 >> 58;
r[16] = t0 & 0x3ffffffffffffffL;
r[17] = t0 >> 58;
r[17] = (sp_digit)(t0 >> 58);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -35834,7 +35834,7 @@ SP_NOINLINE static void sp_521_sqr_9(sp_digit* r, const sp_digit* a)
t0 = ((sp_int128)a[ 8]) * a[ 8];
r[15] = t1 & 0x3ffffffffffffffL; t0 += t1 >> 58;
r[16] = t0 & 0x3ffffffffffffffL;
r[17] = t0 >> 58;
r[17] = (sp_digit)(t0 >> 58);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -43035,7 +43035,7 @@ SP_NOINLINE static void sp_1024_mul_9(sp_digit* r, const sp_digit* a,
t0 = ((sp_int128)a[ 8]) * b[ 8];
r[15] = t1 & 0x1ffffffffffffffL; t0 += t1 >> 57;
r[16] = t0 & 0x1ffffffffffffffL;
r[17] = t0 >> 57;
r[17] = (sp_digit)(t0 >> 57);
XMEMCPY(r, t, sizeof(t));
}

Expand Down Expand Up @@ -43112,7 +43112,7 @@ SP_NOINLINE static void sp_1024_sqr_9(sp_digit* r, const sp_digit* a)
t0 = ((sp_int128)a[ 8]) * a[ 8];
r[15] = t1 & 0x1ffffffffffffffL; t0 += t1 >> 57;
r[16] = t0 & 0x1ffffffffffffffL;
r[17] = t0 >> 57;
r[17] = (sp_digit)(t0 >> 57);
XMEMCPY(r, t, sizeof(t));
}

Expand Down