|
|
|
|
@ -3,15 +3,15 @@ From: czurnieden <czurnieden@gmx.de>
|
|
|
|
|
Date: Tue, 9 May 2023 17:17:12 +0200
|
|
|
|
|
Subject: [PATCH] Fix possible integer overflow
|
|
|
|
|
|
|
|
|
|
[fsumsal] Slightly altered to make it work with libtommath-1.1.0
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
bn_mp_2expt.c | 4 ++++
|
|
|
|
|
bn_mp_grow.c | 4 ++++
|
|
|
|
|
bn_mp_init_size.c | 5 +++++
|
|
|
|
|
bn_mp_mul_2d.c | 4 ++++
|
|
|
|
|
bn_s_mp_mul_digs.c | 4 ++++
|
|
|
|
|
bn_s_mp_mul_digs_fast.c | 4 ++++
|
|
|
|
|
bn_s_mp_mul_high_digs.c | 4 ++++
|
|
|
|
|
bn_s_mp_mul_high_digs_fast.c | 4 ++++
|
|
|
|
|
8 files changed, 33 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/bn_mp_2expt.c b/bn_mp_2expt.c
|
|
|
|
|
@ -20,7 +20,7 @@ index 0ae3df1bf..23de0c3c5 100644
|
|
|
|
|
+++ b/bn_mp_2expt.c
|
|
|
|
|
@@ -12,6 +12,10 @@ mp_err mp_2expt(mp_int *a, int b)
|
|
|
|
|
{
|
|
|
|
|
mp_err err;
|
|
|
|
|
int res;
|
|
|
|
|
|
|
|
|
|
+ if (b < 0) {
|
|
|
|
|
+ return MP_VAL;
|
|
|
|
|
@ -43,30 +43,29 @@ index 9e904c547..2b1682651 100644
|
|
|
|
|
+
|
|
|
|
|
/* if the alloc size is smaller alloc more ram */
|
|
|
|
|
if (a->alloc < size) {
|
|
|
|
|
/* reallocate the array a->dp
|
|
|
|
|
/* ensure there are always at least MP_PREC digits extra on top */
|
|
|
|
|
diff --git a/bn_mp_init_size.c b/bn_mp_init_size.c
|
|
|
|
|
index d62268721..99573833f 100644
|
|
|
|
|
--- a/bn_mp_init_size.c
|
|
|
|
|
+++ b/bn_mp_init_size.c
|
|
|
|
|
@@ -6,6 +6,11 @@
|
|
|
|
|
/* init an mp_init for a given size */
|
|
|
|
|
mp_err mp_init_size(mp_int *a, int size)
|
|
|
|
|
@@ -6,6 +6,10 @@
|
|
|
|
|
{
|
|
|
|
|
+
|
|
|
|
|
int x;
|
|
|
|
|
|
|
|
|
|
+ if (size < 0) {
|
|
|
|
|
+ return MP_VAL;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
size = MP_MAX(MP_MIN_PREC, size);
|
|
|
|
|
/* pad size so there are always extra digits */
|
|
|
|
|
size += (MP_PREC * 2) - (size % MP_PREC);
|
|
|
|
|
|
|
|
|
|
/* alloc mem */
|
|
|
|
|
diff --git a/bn_mp_mul_2d.c b/bn_mp_mul_2d.c
|
|
|
|
|
index 87354de20..bfeaf2eb2 100644
|
|
|
|
|
--- a/bn_mp_mul_2d.c
|
|
|
|
|
+++ b/bn_mp_mul_2d.c
|
|
|
|
|
@@ -9,6 +9,10 @@ mp_err mp_mul_2d(const mp_int *a, int b, mp_int *c)
|
|
|
|
|
mp_digit d;
|
|
|
|
|
mp_err err;
|
|
|
|
|
int res;
|
|
|
|
|
|
|
|
|
|
+ if (b < 0) {
|
|
|
|
|
+ return MP_VAL;
|
|
|
|
|
@ -74,7 +73,7 @@ index 87354de20..bfeaf2eb2 100644
|
|
|
|
|
+
|
|
|
|
|
/* copy */
|
|
|
|
|
if (a != c) {
|
|
|
|
|
if ((err = mp_copy(a, c)) != MP_OKAY) {
|
|
|
|
|
if ((res = mp_copy(a, c)) != MP_OKAY) {
|
|
|
|
|
diff --git a/bn_s_mp_mul_digs.c b/bn_s_mp_mul_digs.c
|
|
|
|
|
index 64509d4cb..3682b4980 100644
|
|
|
|
|
--- a/bn_s_mp_mul_digs.c
|
|
|
|
|
@ -88,29 +87,14 @@ index 64509d4cb..3682b4980 100644
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
/* can we use the fast multiplier? */
|
|
|
|
|
if ((digs < MP_WARRAY) &&
|
|
|
|
|
(MP_MIN(a->used, b->used) < MP_MAXFAST)) {
|
|
|
|
|
diff --git a/bn_s_mp_mul_digs_fast.c b/bn_s_mp_mul_digs_fast.c
|
|
|
|
|
index b2a287b02..3c4176a87 100644
|
|
|
|
|
--- a/bn_s_mp_mul_digs_fast.c
|
|
|
|
|
+++ b/bn_s_mp_mul_digs_fast.c
|
|
|
|
|
@@ -26,6 +26,10 @@ mp_err s_mp_mul_digs_fast(const mp_int *a, const mp_int *b, mp_int *c, int digs)
|
|
|
|
|
mp_digit W[MP_WARRAY];
|
|
|
|
|
mp_word _W;
|
|
|
|
|
|
|
|
|
|
+ if (digs < 0) {
|
|
|
|
|
+ return MP_VAL;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
/* grow the destination as required */
|
|
|
|
|
if (c->alloc < digs) {
|
|
|
|
|
if ((err = mp_grow(c, digs)) != MP_OKAY) {
|
|
|
|
|
if ((digs < (int)MP_WARRAY) &&
|
|
|
|
|
(MIN(a->used, b->used) <
|
|
|
|
|
diff --git a/bn_s_mp_mul_high_digs.c b/bn_s_mp_mul_high_digs.c
|
|
|
|
|
index 2bb2a5098..c9dd355f8 100644
|
|
|
|
|
--- a/bn_s_mp_mul_high_digs.c
|
|
|
|
|
+++ b/bn_s_mp_mul_high_digs.c
|
|
|
|
|
@@ -15,6 +15,10 @@ mp_err s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs)
|
|
|
|
|
mp_word r;
|
|
|
|
|
mp_word r;
|
|
|
|
|
mp_digit tmpx, *tmpt, *tmpy;
|
|
|
|
|
|
|
|
|
|
+ if (digs < 0) {
|
|
|
|
|
@ -118,20 +102,5 @@ index 2bb2a5098..c9dd355f8 100644
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
/* can we use the fast multiplier? */
|
|
|
|
|
if (MP_HAS(S_MP_MUL_HIGH_DIGS_FAST)
|
|
|
|
|
&& ((a->used + b->used + 1) < MP_WARRAY)
|
|
|
|
|
diff --git a/bn_s_mp_mul_high_digs_fast.c b/bn_s_mp_mul_high_digs_fast.c
|
|
|
|
|
index a2c4fb692..4ce7f590c 100644
|
|
|
|
|
--- a/bn_s_mp_mul_high_digs_fast.c
|
|
|
|
|
+++ b/bn_s_mp_mul_high_digs_fast.c
|
|
|
|
|
@@ -19,6 +19,10 @@ mp_err s_mp_mul_high_digs_fast(const mp_int *a, const mp_int *b, mp_int *c, int
|
|
|
|
|
mp_digit W[MP_WARRAY];
|
|
|
|
|
mp_word _W;
|
|
|
|
|
|
|
|
|
|
+ if (digs < 0) {
|
|
|
|
|
+ return MP_VAL;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
/* grow the destination as required */
|
|
|
|
|
pa = a->used + b->used;
|
|
|
|
|
if (c->alloc < pa) {
|
|
|
|
|
#ifdef BN_FAST_S_MP_MUL_HIGH_DIGS_C
|
|
|
|
|
if (((a->used + b->used + 1) < (int)MP_WARRAY)
|
|
|
|
|
|
Frantisek Sumsal
Troy Dawson
Simone Caronni
Igor Gnatenko