wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-04 13:14:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix in SP C impl for small stack

Browse Source 
Memset correct size and only when pointer is not NULL.
This commit is contained in:
Sean Parkinson
2020-01-08 08:57:20 +10:00
parent d257003341
commit 1f1a173d56
2 changed files with 92 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
wolfcrypt/src/sp_c32.c
View File

@@ -3859,11 +3859,14 @@ int sp_ModExp_2048(mp_int* base, mp_int* exp, mp_int* mod, mp_int* res)
err = sp_2048_to_mp(r, res); err = sp_2048_to_mp(r, res);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 90U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 90U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 90U);
#endif #endif
return err; return err;
@@ -4105,12 +4108,13 @@ static int sp_2048_mod_exp_2_90(sp_digit* r, const sp_digit* e, int bits, const
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
norm = td; norm = td;
tmp = td + 180; tmp = td + 180;
XMEMSET(td, 0, sizeof(sp_digit) * 271);
#else #else
norm = nd; norm = nd;
tmp = td; tmp = td;
XMEMSET(td, 0, sizeof(td));
#endif #endif
XMEMSET(td, 0, sizeof(td));
sp_2048_mont_setup(m, &mp); sp_2048_mont_setup(m, &mp);
sp_2048_mont_norm_90(norm, m); sp_2048_mont_norm_90(norm, m);
@@ -4332,11 +4336,13 @@ int sp_DhExp_2048(mp_int* base, const byte* exp, word32 expLen,
XMEMMOVE(out, out + i, *outLen); XMEMMOVE(out, out + i, *outLen);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 90U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 90U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 90U);
#endif #endif
return err; return err;
@@ -4471,11 +4477,14 @@ int sp_ModExp_1024(mp_int* base, mp_int* exp, mp_int* mod, mp_int* res)
err = sp_2048_to_mp(r, res); err = sp_2048_to_mp(r, res);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 45U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 45U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 45U);
#endif #endif
return err; return err;
@@ -7723,11 +7732,14 @@ int sp_ModExp_3072(mp_int* base, mp_int* exp, mp_int* mod, mp_int* res)
err = sp_3072_to_mp(r, res); err = sp_3072_to_mp(r, res);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 134U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 134U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 134U);
#endif #endif
return err; return err;
@@ -8057,12 +8069,13 @@ static int sp_3072_mod_exp_2_134(sp_digit* r, const sp_digit* e, int bits, const
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
norm = td; norm = td;
tmp = td + 268; tmp = td + 268;
XMEMSET(td, 0, sizeof(sp_digit) * 403);
#else #else
norm = nd; norm = nd;
tmp = td; tmp = td;
XMEMSET(td, 0, sizeof(td));
#endif #endif
XMEMSET(td, 0, sizeof(td));
sp_3072_mont_setup(m, &mp); sp_3072_mont_setup(m, &mp);
sp_3072_mont_norm_134(norm, m); sp_3072_mont_norm_134(norm, m);
@@ -8284,11 +8297,13 @@ int sp_DhExp_3072(mp_int* base, const byte* exp, word32 expLen,
XMEMMOVE(out, out + i, *outLen); XMEMMOVE(out, out + i, *outLen);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 134U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 134U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 134U);
#endif #endif
return err; return err;
@@ -8423,11 +8438,14 @@ int sp_ModExp_1536(mp_int* base, mp_int* exp, mp_int* mod, mp_int* res)
err = sp_3072_to_mp(r, res); err = sp_3072_to_mp(r, res);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 67U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 67U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 67U);
#endif #endif
return err; return err;
@@ -11746,11 +11764,14 @@ int sp_ModExp_4096(mp_int* base, mp_int* exp, mp_int* mod, mp_int* res)
err = sp_4096_to_mp(r, res); err = sp_4096_to_mp(r, res);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 196U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 196U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 196U);
#endif #endif
return err; return err;
@@ -12204,12 +12225,13 @@ static int sp_4096_mod_exp_2_196(sp_digit* r, const sp_digit* e, int bits, const
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
norm = td; norm = td;
tmp = td + 392; tmp = td + 392;
XMEMSET(td, 0, sizeof(sp_digit) * 589);
#else #else
norm = nd; norm = nd;
tmp = td; tmp = td;
XMEMSET(td, 0, sizeof(td));
#endif #endif
XMEMSET(td, 0, sizeof(td));
sp_4096_mont_setup(m, &mp); sp_4096_mont_setup(m, &mp);
sp_4096_mont_norm_196(norm, m); sp_4096_mont_norm_196(norm, m);
@@ -12431,11 +12453,13 @@ int sp_DhExp_4096(mp_int* base, const byte* exp, word32 expLen,
XMEMMOVE(out, out + i, *outLen); XMEMMOVE(out, out + i, *outLen);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 196U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 196U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 196U);
#endif #endif
return err; return err;

68
wolfcrypt/src/sp_c64.c
View File

@@ -3402,11 +3402,14 @@ int sp_ModExp_2048(mp_int* base, mp_int* exp, mp_int* mod, mp_int* res)
err = sp_2048_to_mp(r, res); err = sp_2048_to_mp(r, res);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 36U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 36U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 36U);
#endif #endif
return err; return err;
@@ -3540,12 +3543,13 @@ static int sp_2048_mod_exp_2_36(sp_digit* r, const sp_digit* e, int bits, const
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
norm = td; norm = td;
tmp = td + 72; tmp = td + 72;
XMEMSET(td, 0, sizeof(sp_digit) * 109);
#else #else
norm = nd; norm = nd;
tmp = td; tmp = td;
XMEMSET(td, 0, sizeof(td));
#endif #endif
XMEMSET(td, 0, sizeof(td));
sp_2048_mont_setup(m, &mp); sp_2048_mont_setup(m, &mp);
sp_2048_mont_norm_36(norm, m); sp_2048_mont_norm_36(norm, m);
@@ -3768,11 +3772,13 @@ int sp_DhExp_2048(mp_int* base, const byte* exp, word32 expLen,
XMEMMOVE(out, out + i, *outLen); XMEMMOVE(out, out + i, *outLen);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 36U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 36U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 36U);
#endif #endif
return err; return err;
@@ -3907,11 +3913,14 @@ int sp_ModExp_1024(mp_int* base, mp_int* exp, mp_int* mod, mp_int* res)
err = sp_2048_to_mp(r, res); err = sp_2048_to_mp(r, res);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 18U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 18U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 18U);
#endif #endif
return err; return err;
@@ -7446,11 +7455,14 @@ int sp_ModExp_3072(mp_int* base, mp_int* exp, mp_int* mod, mp_int* res)
err = sp_3072_to_mp(r, res); err = sp_3072_to_mp(r, res);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 54U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 54U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 54U);
#endif #endif
return err; return err;
@@ -7620,12 +7632,13 @@ static int sp_3072_mod_exp_2_54(sp_digit* r, const sp_digit* e, int bits, const
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
norm = td; norm = td;
tmp = td + 108; tmp = td + 108;
XMEMSET(td, 0, sizeof(sp_digit) * 163);
#else #else
norm = nd; norm = nd;
tmp = td; tmp = td;
XMEMSET(td, 0, sizeof(td));
#endif #endif
XMEMSET(td, 0, sizeof(td));
sp_3072_mont_setup(m, &mp); sp_3072_mont_setup(m, &mp);
sp_3072_mont_norm_54(norm, m); sp_3072_mont_norm_54(norm, m);
@@ -7848,11 +7861,13 @@ int sp_DhExp_3072(mp_int* base, const byte* exp, word32 expLen,
XMEMMOVE(out, out + i, *outLen); XMEMMOVE(out, out + i, *outLen);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 54U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 54U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 54U);
#endif #endif
return err; return err;
@@ -7987,11 +8002,14 @@ int sp_ModExp_1536(mp_int* base, mp_int* exp, mp_int* mod, mp_int* res)
err = sp_3072_to_mp(r, res); err = sp_3072_to_mp(r, res);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 27U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 27U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 27U);
#endif #endif
return err; return err;
@@ -11799,11 +11817,14 @@ int sp_ModExp_4096(mp_int* base, mp_int* exp, mp_int* mod, mp_int* res)
err = sp_4096_to_mp(r, res); err = sp_4096_to_mp(r, res);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 78U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 78U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 78U);
#endif #endif
return err; return err;
@@ -12021,12 +12042,13 @@ static int sp_4096_mod_exp_2_78(sp_digit* r, const sp_digit* e, int bits, const
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
norm = td; norm = td;
tmp = td + 156; tmp = td + 156;
XMEMSET(td, 0, sizeof(sp_digit) * 235);
#else #else
norm = nd; norm = nd;
tmp = td; tmp = td;
XMEMSET(td, 0, sizeof(td));
#endif #endif
XMEMSET(td, 0, sizeof(td));
sp_4096_mont_setup(m, &mp); sp_4096_mont_setup(m, &mp);
sp_4096_mont_norm_78(norm, m); sp_4096_mont_norm_78(norm, m);
@@ -12249,11 +12271,13 @@ int sp_DhExp_4096(mp_int* base, const byte* exp, word32 expLen,
XMEMMOVE(out, out + i, *outLen); XMEMMOVE(out, out + i, *outLen);
} }
XMEMSET(e, 0, sizeof(sp_digit) * 78U);
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
if (d != NULL) if (d != NULL) {
XMEMSET(e, 0, sizeof(sp_digit) * 78U);
XFREE(d, NULL, DYNAMIC_TYPE_DH); XFREE(d, NULL, DYNAMIC_TYPE_DH);
}
#else
XMEMSET(e, 0, sizeof(sp_digit) * 78U);
#endif #endif
return err; return err;