wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-05 15:30:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9964 from SparkiDev/asm_gen_fixes_1

Browse Source 
SP fixes: 32-bit ARM assembly fixes
This commit is contained in:
David Garske
2026-03-13 06:16:57 +01:00
committed by GitHub
parent bac0563669 d23cb79f18
commit cdacf3a53e
3 changed files with 111 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wolfcrypt/src/sp_arm32.c
+37 -27
View File
@@ -12500,9 +12500,9 @@ static int sp_2048_mod_exp_32(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -12653,9 +12653,9 @@ static int sp_2048_mod_exp_32(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -17366,9 +17366,9 @@ static int sp_2048_mod_exp_64(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -17502,9 +17502,9 @@ static int sp_2048_mod_exp_64(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -18648,9 +18648,9 @@ static int sp_2048_mod_exp_2_64(sp_digit* r, const sp_digit* e, int bits,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -38355,9 +38355,9 @@ static int sp_3072_mod_exp_48(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -38508,9 +38508,9 @@ static int sp_3072_mod_exp_48(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -45090,9 +45090,9 @@ static int sp_3072_mod_exp_96(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -45226,9 +45226,9 @@ static int sp_3072_mod_exp_96(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -46620,9 +46620,9 @@ static int sp_3072_mod_exp_2_96(sp_digit* r, const sp_digit* e, int bits,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -60698,9 +60698,9 @@ static int sp_4096_mod_exp_128(sp_digit* r, const sp_digit* a, const sp_digit* e
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -60834,9 +60834,9 @@ static int sp_4096_mod_exp_128(sp_digit* r, const sp_digit* a, const sp_digit* e
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -62476,9 +62476,9 @@ static int sp_4096_mod_exp_2_128(sp_digit* r, const sp_digit* e, int bits,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -120421,7 +120421,17 @@ static int sp_521_ecc_mulmod_fast_17(sp_point_521* r, const sp_point_521* g, con
}
y = k[0] & 0x1;
sp_521_proj_point_dbl_17(rt, rt, tmp);
sp_521_proj_point_add_17(rt, rt, &t[y], tmp);
#ifndef WC_NO_CACHE_RESISTANT
if (ct) {
sp_521_get_point_16_17(p, t, y);
p->infinity = !y;
sp_521_proj_point_add_17(rt, rt, p, tmp);
}
else
#endif
{
sp_521_proj_point_add_17(rt, rt, &t[y], tmp);
}
if (map != 0) {
sp_521_map_17(r, rt, tmp);
wolfcrypt/src/sp_armthumb.c
+37 -27
View File
@@ -24132,9 +24132,9 @@ static int sp_2048_mod_exp_32(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -24285,9 +24285,9 @@ static int sp_2048_mod_exp_32(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -27684,9 +27684,9 @@ static int sp_2048_mod_exp_64(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -27820,9 +27820,9 @@ static int sp_2048_mod_exp_64(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -30010,9 +30010,9 @@ static int sp_2048_mod_exp_2_64(sp_digit* r, const sp_digit* e, int bits,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -75473,9 +75473,9 @@ static int sp_3072_mod_exp_48(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -75626,9 +75626,9 @@ static int sp_3072_mod_exp_48(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -79856,9 +79856,9 @@ static int sp_3072_mod_exp_96(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -79992,9 +79992,9 @@ static int sp_3072_mod_exp_96(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -82980,9 +82980,9 @@ static int sp_3072_mod_exp_2_96(sp_digit* r, const sp_digit* e, int bits,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -92314,9 +92314,9 @@ static int sp_4096_mod_exp_128(sp_digit* r, const sp_digit* a, const sp_digit* e
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -92450,9 +92450,9 @@ static int sp_4096_mod_exp_128(sp_digit* r, const sp_digit* a, const sp_digit* e
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -96231,9 +96231,9 @@ static int sp_4096_mod_exp_2_128(sp_digit* r, const sp_digit* e, int bits,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -124360,7 +124360,17 @@ static int sp_521_ecc_mulmod_fast_17(sp_point_521* r, const sp_point_521* g, con
}
y = k[0] & 0x1;
sp_521_proj_point_dbl_17(rt, rt, tmp);
sp_521_proj_point_add_17(rt, rt, &t[y], tmp);
#ifndef WC_NO_CACHE_RESISTANT
if (ct) {
sp_521_get_point_16_17(p, t, y);
p->infinity = !y;
sp_521_proj_point_add_17(rt, rt, p, tmp);
}
else
#endif
{
sp_521_proj_point_add_17(rt, rt, &t[y], tmp);
}
if (map != 0) {
sp_521_map_17(r, rt, tmp);
wolfcrypt/src/sp_cortexm.c
+37 -27
View File
@@ -5427,9 +5427,9 @@ static int sp_2048_mod_exp_32(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -5580,9 +5580,9 @@ static int sp_2048_mod_exp_32(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -8544,9 +8544,9 @@ static int sp_2048_mod_exp_64(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -8680,9 +8680,9 @@ static int sp_2048_mod_exp_64(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -9821,9 +9821,9 @@ static int sp_2048_mod_exp_2_64(sp_digit* r, const sp_digit* e, int bits,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -17097,9 +17097,9 @@ static int sp_3072_mod_exp_48(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -17250,9 +17250,9 @@ static int sp_3072_mod_exp_48(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -21150,9 +21150,9 @@ static int sp_3072_mod_exp_96(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -21286,9 +21286,9 @@ static int sp_3072_mod_exp_96(sp_digit* r, const sp_digit* a, const sp_digit* e,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -22675,9 +22675,9 @@ static int sp_3072_mod_exp_2_96(sp_digit* r, const sp_digit* e, int bits,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -29499,9 +29499,9 @@ static int sp_4096_mod_exp_128(sp_digit* r, const sp_digit* a, const sp_digit* e
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -29635,9 +29635,9 @@ static int sp_4096_mod_exp_128(sp_digit* r, const sp_digit* a, const sp_digit* e
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -31272,9 +31272,9 @@ static int sp_4096_mod_exp_2_128(sp_digit* r, const sp_digit* e, int bits,
c = -c;
y = (byte)(n << c);
n = e[i--];
y |= (byte)(n >> (64 - c));
y |= (byte)(n >> (32 - c));
n <<= c;
c = 64 - c;
c = 32 - c;
}
else if (c == 0) {
/* All bits in top word used. */
@@ -58435,7 +58435,17 @@ static int sp_521_ecc_mulmod_fast_17(sp_point_521* r, const sp_point_521* g, con
}
y = k[0] & 0x1;
sp_521_proj_point_dbl_17(rt, rt, tmp);
sp_521_proj_point_add_17(rt, rt, &t[y], tmp);
#ifndef WC_NO_CACHE_RESISTANT
if (ct) {
sp_521_get_point_16_17(p, t, y);
p->infinity = !y;
sp_521_proj_point_add_17(rt, rt, p, tmp);
}
else
#endif
{
sp_521_proj_point_add_17(rt, rt, &t[y], tmp);
}
if (map != 0) {
sp_521_map_17(r, rt, tmp);