WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3757 from SparkiDev/sp_smallstack_fixes 

sp_lcm small stack: fix size of temporary
pull/3742/head
toddouska 2021-02-15 12:25:13 -08:00 committed by GitHub
parent 888fab501b e187a74b1c
commit 917205442b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wolfcrypt/src/sp_int.c
View File

@ -4021,7 +4021,11 @@ int sp_submod(sp_int* a, sp_int* b, sp_int* m, sp_int* r)
{ {
#ifndef WOLFSSL_SP_INT_NEGATIVE #ifndef WOLFSSL_SP_INT_NEGATIVE
int err = MP_OKAY; int err = MP_OKAY;
DECL_SP_INT_ARRAY(t, (m == NULL) ? 1 : m->used + 1, 2); int used = ((a == NULL) || (b == NULL) || (m == NULL)) ? 1 :
((a->used >= m->used) ?
((a->used >= b->used) ? (a->used + 1) : (b->used + 1)) :
((b->used >= m->used)) ? (b->used + 1) : (m->used + 1));
DECL_SP_INT_ARRAY(t, used, 2);
if ((a == NULL) || (b == NULL) || (m == NULL) || (r == NULL)) { if ((a == NULL) || (b == NULL) || (m == NULL) || (r == NULL)) {
err = MP_VAL; err = MP_VAL;
@ -4033,7 +4037,7 @@ int sp_submod(sp_int* a, sp_int* b, sp_int* m, sp_int* r)
sp_print(m, "m"); sp_print(m, "m");
} }
ALLOC_SP_INT_ARRAY(t, m->used + 1, 2, err, NULL); ALLOC_SP_INT_ARRAY(t, used, 2, err, NULL);
if (err == MP_OKAY) { if (err == MP_OKAY) {
if (_sp_cmp(a, m) == MP_GT) { if (_sp_cmp(a, m) == MP_GT) {
err = sp_mod(a, m, t[0]); err = sp_mod(a, m, t[0]);
@ -4443,6 +4447,12 @@ int sp_div(sp_int* a, sp_int* d, sp_int* r, sp_int* rem)
if ((err == MP_OKAY) && sp_iszero(d)) { if ((err == MP_OKAY) && sp_iszero(d)) {
err = MP_VAL; err = MP_VAL;
} }
if ((err == MP_OKAY) && (r != NULL) && (r->size < a->used - d->used + 2)) {
err = MP_VAL;
}
if ((err == MP_OKAY) && (rem != NULL) && (rem->size < a->used + 1)) {
err = MP_VAL;
}
if (0 && (err == MP_OKAY)) { if (0 && (err == MP_OKAY)) {
sp_print(a, "a"); sp_print(a, "a");
@ -7728,7 +7738,9 @@ int sp_invmod(sp_int* a, sp_int* m, sp_int* r)
sp_int* v; sp_int* v;
sp_int* b; sp_int* b;
sp_int* c; sp_int* c;
DECL_SP_INT_ARRAY(t, (m == NULL) ? 0 : m->used + 1, 4); int used = ((m == NULL) || (a == NULL)) ? 1 :
((m->used >= a->used) ? m->used + 1 : a->used + 1);
DECL_SP_INT_ARRAY(t, used, 4);
if ((a == NULL) || (m == NULL) || (r == NULL)) { if ((a == NULL) || (m == NULL) || (r == NULL)) {
err = MP_VAL; err = MP_VAL;
@ -7746,7 +7758,7 @@ int sp_invmod(sp_int* a, sp_int* m, sp_int* r)
v = t[1]; v = t[1];
b = t[2]; b = t[2];
c = t[3]; c = t[3];
sp_init_size(v, m->used + 1); sp_init_size(v, used + 1);
if (_sp_cmp_abs(a, m) != MP_LT) { if (_sp_cmp_abs(a, m) != MP_LT) {
err = sp_mod(a, m, v); err = sp_mod(a, m, v);
@ -13252,7 +13264,7 @@ int sp_gcd(sp_int* a, sp_int* b, sp_int* r)
sp_int* u = NULL; sp_int* u = NULL;
sp_int* v = NULL; sp_int* v = NULL;
sp_int* t = NULL; sp_int* t = NULL;
int used = (a->used >= b->used) ? a->used : b->used; int used = (a->used >= b->used) ? a->used + 1 : b->used + 1;
DECL_SP_INT_ARRAY(d, used, 3); DECL_SP_INT_ARRAY(d, used, 3);
ALLOC_SP_INT_ARRAY(d, used, 3, err, NULL); ALLOC_SP_INT_ARRAY(d, used, 3, err, NULL);
@ -13343,7 +13355,7 @@ int sp_lcm(sp_int* a, sp_int* b, sp_int* r)
{ {
int err = MP_OKAY; int err = MP_OKAY;
int used = ((a == NULL) || (b == NULL)) ? 1 : int used = ((a == NULL) || (b == NULL)) ? 1 :
(a->used >= b->used ? a->used : b->used); (a->used >= b->used ? a->used + 1: b->used + 1);
DECL_SP_INT_ARRAY(t, used, 2); DECL_SP_INT_ARRAY(t, used, 2);
if ((a == NULL) || (b == NULL) || (r == NULL)) { if ((a == NULL) || (b == NULL) || (r == NULL)) {