patch libtommath for CVE-2023-36328 (#6193)

* patch libtommatch for CVE-2023-36328

* increment version; add changelog entry

* Update SPECS-EXTENDED/libtommath/libtommath.spec

Co-authored-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

---------

Co-authored-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

SPECS-EXTENDED/libtommath/CVE-2023-36328.patch

@@ -0,0 +1,136 @@
+From beba892bc0d4e4ded4d667ab1d2a94f4d75109a9 Mon Sep 17 00:00:00 2001
+From: czurnieden <czurnieden@gmx.de>
+Date: Tue, 9 May 2023 17:17:12 +0200
+Subject: [PATCH] Fix possible integer overflow
+
+---
+ 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
+index 0ae3df1bf..23de0c3c5 100644
+--- a/bn_mp_2expt.c
++++ b/bn_mp_2expt.c
+@@ -21,6 +21,10 @@ int mp_2expt(mp_int *a, int b)
+ {
+    int     res;
+ 
++   if (b < 0) {
++      return MP_VAL;
++   }
++
+    /* zero a as per default */
+    mp_zero(a);
+ 
+diff --git a/bn_mp_grow.c b/bn_mp_grow.c
+index 9e904c547..2b1682651 100644
+--- a/bn_mp_grow.c
++++ b/bn_mp_grow.c
+@@ -18,6 +18,10 @@ int mp_grow(mp_int *a, int size)
+    int     i;
+    mp_digit *tmp;
+ 
++   if (size < 0) {
++      return MP_VAL;
++   }
++
+    /* if the alloc size is smaller alloc more ram */
+    if (a->alloc < size) {
+       /* 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
+@@ -17,6 +17,10 @@ int mp_init_size(mp_int *a, int size)
+ {
+    int x;
+ 
++   if (size < 0) {
++      return MP_VAL;
++   }
++
+    /* pad size so there are always extra digits */
+    size += (MP_PREC * 2) - (size % MP_PREC);
+ 
+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
+@@ -18,6 +18,10 @@ int mp_mul_2d(const mp_int *a, int b, mp_int *c)
+    mp_digit d;
+    int      res;
+ 
++   if (b < 0) {
++      return MP_VAL;
++   }
++
+    /* copy */
+    if (a != c) {
+       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
++++ b/bn_s_mp_mul_digs.c
+@@ -24,6 +24,10 @@ int s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs)
+    mp_word r;
+    mp_digit tmpx, *tmpt, *tmpy;
+ 
++   if (digs < 0) {
++      return MP_VAL;
++   }
++
+    /* can we use the fast multiplier? */
+    if ((digs < (int)MP_WARRAY) &&
+        (MIN(a->used, b->used) <
+# 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) {
+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
+@@ -23,6 +23,10 @@ int s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs)
+    mp_word r;
+    mp_digit tmpx, *tmpt, *tmpy;
+ 
++   if (digs < 0) {
++      return MP_VAL;
++   }
++
+    /* can we use the fast multiplier? */
+ #ifdef BN_FAST_S_MP_MUL_HIGH_DIGS_C
+    if (((a->used + b->used + 1) < (int)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) {

SPECS-EXTENDED/libtommath/libtommath.spec

@@ -1,12 +1,13 @@
 Summary:        A portable number theoretic multiple-precision integer library
 Name:           libtommath
 Version:        1.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        Public Domain
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://www.libtom.net/
 Source0:        https://github.com/libtom/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0:         CVE-2023-36328.patch
 
 BuildRequires:  libtool
 
@@ -25,7 +26,7 @@ The %{name}-devel package contains libraries and header files for developing
 applications that use %{name}.
 
 %prep
-%setup -q
+%autosetup -p1
 # Fix permissions on installed library
 sed -i -e 's/644 $(LIBNAME)/755 $(LIBNAME)/g' makefile.shared
 # Fix pkgconfig path
@@ -56,6 +57,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Sep 07 2023 Brian Fjeldstad <bfjelds@microsoft.com> - 1.1.0-5
+- Fix CVE-2023-36328
+
 * Fri Feb 04 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.1.0-4
 - Removing docs to drop dependency on 'ghostscript'.
 - License verified.