isaacpittman-hitachi / rpms / openssl

Forked from rpms/openssl 2 years ago
Clone
6e1574
From 3118eb64934499d93db3230748a452351d1d9a65 Mon Sep 17 00:00:00 2001
6e1574
From: Tomas Mraz <tomas@openssl.org>
6e1574
Date: Mon, 28 Feb 2022 18:26:21 +0100
6e1574
Subject: [PATCH] Fix possible infinite loop in BN_mod_sqrt()
6e1574
6e1574
The calculation in some cases does not finish for non-prime p.
6e1574
6e1574
This fixes CVE-2022-0778.
6e1574
6e1574
Based on patch by David Benjamin <davidben@google.com>.
6e1574
6e1574
Reviewed-by: Paul Dale <pauli@openssl.org>
6e1574
Reviewed-by: Matt Caswell <matt@openssl.org>
6e1574
---
6e1574
 crypto/bn/bn_sqrt.c | 30 ++++++++++++++++++------------
6e1574
 1 file changed, 18 insertions(+), 12 deletions(-)
6e1574
6e1574
From b5fcb7e133725b8b2eb66f63f5142710ed63a6d1 Mon Sep 17 00:00:00 2001
6e1574
From: Tomas Mraz <tomas@openssl.org>
6e1574
Date: Mon, 28 Feb 2022 18:26:30 +0100
6e1574
Subject: [PATCH] Add documentation of BN_mod_sqrt()
6e1574
6e1574
Reviewed-by: Paul Dale <pauli@openssl.org>
6e1574
Reviewed-by: Matt Caswell <matt@openssl.org>
6e1574
---
6e1574
 doc/man3/BN_add.pod | 15 +++++++++++++--
6e1574
 1 file changed, 13 insertions(+), 2 deletions(-)
6e1574
6e1574
From 3ef5c3034e5c545f34d6929568f3f2b10ac4bdf0 Mon Sep 17 00:00:00 2001
6e1574
From: Tomas Mraz <tomas@openssl.org>
6e1574
Date: Mon, 28 Feb 2022 18:26:35 +0100
6e1574
Subject: [PATCH] Add a negative testcase for BN_mod_sqrt
6e1574
6e1574
Reviewed-by: Paul Dale <pauli@openssl.org>
6e1574
Reviewed-by: Matt Caswell <matt@openssl.org>
6e1574
---
6e1574
 test/bntest.c                          | 11 ++++++++++-
6e1574
 test/recipes/10-test_bn_data/bnmod.txt | 12 ++++++++++++
6e1574
 2 files changed, 22 insertions(+), 1 deletion(-)
6e1574
6e1574
diff --git a/crypto/bn/bn_sqrt.c b/crypto/bn/bn_sqrt.c
6e1574
index 1723d5ded5a8..53b0f559855c 100644
6e1574
--- a/crypto/bn/bn_sqrt.c
6e1574
+++ b/crypto/bn/bn_sqrt.c
6e1574
@@ -14,7 +14,8 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
6e1574
 /*
6e1574
  * Returns 'ret' such that ret^2 == a (mod p), using the Tonelli/Shanks
6e1574
  * algorithm (cf. Henri Cohen, "A Course in Algebraic Computational Number
6e1574
- * Theory", algorithm 1.5.1). 'p' must be prime!
6e1574
+ * Theory", algorithm 1.5.1). 'p' must be prime, otherwise an error or
6e1574
+ * an incorrect "result" will be returned.
6e1574
  */
6e1574
 {
6e1574
     BIGNUM *ret = in;
6e1574
@@ -301,18 +302,23 @@ BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
6e1574
             goto vrfy;
6e1574
         }
6e1574
 
6e1574
-        /* find smallest  i  such that  b^(2^i) = 1 */
6e1574
-        i = 1;
6e1574
-        if (!BN_mod_sqr(t, b, p, ctx))
6e1574
-            goto end;
6e1574
-        while (!BN_is_one(t)) {
6e1574
-            i++;
6e1574
-            if (i == e) {
6e1574
-                BNerr(BN_F_BN_MOD_SQRT, BN_R_NOT_A_SQUARE);
6e1574
-                goto end;
6e1574
+        /* Find the smallest i, 0 < i < e, such that b^(2^i) = 1. */
6e1574
+        for (i = 1; i < e; i++) {
6e1574
+            if (i == 1) {
6e1574
+                if (!BN_mod_sqr(t, b, p, ctx))
6e1574
+                    goto end;
6e1574
+
6e1574
+            } else {
6e1574
+                if (!BN_mod_mul(t, t, t, p, ctx))
6e1574
+                    goto end;
6e1574
             }
6e1574
-            if (!BN_mod_mul(t, t, t, p, ctx))
6e1574
-                goto end;
6e1574
+            if (BN_is_one(t))
6e1574
+                break;
6e1574
+        }
6e1574
+        /* If not found, a is not a square or p is not prime. */
6e1574
+        if (i >= e) {
6e1574
+            BNerr(BN_F_BN_MOD_SQRT, BN_R_NOT_A_SQUARE);
6e1574
+            goto end;
6e1574
         }
6e1574
 
6e1574
         /* t := y^2^(e - i - 1) */
6e1574
diff --git a/doc/man3/BN_add.pod b/doc/man3/BN_add.pod
6e1574
index dccd4790ede7..1f5e37a4d183 100644
6e1574
--- a/doc/man3/BN_add.pod
6e1574
+++ b/doc/man3/BN_add.pod
6e1574
@@ -3,7 +3,7 @@
6e1574
 =head1 NAME
6e1574
 
6e1574
 BN_add, BN_sub, BN_mul, BN_sqr, BN_div, BN_mod, BN_nnmod, BN_mod_add,
6e1574
-BN_mod_sub, BN_mod_mul, BN_mod_sqr, BN_exp, BN_mod_exp, BN_gcd -
6e1574
+BN_mod_sub, BN_mod_mul, BN_mod_sqr, BN_mod_sqrt, BN_exp, BN_mod_exp, BN_gcd -
6e1574
 arithmetic operations on BIGNUMs
6e1574
 
6e1574
 =head1 SYNOPSIS
6e1574
@@ -36,6 +36,8 @@ arithmetic operations on BIGNUMs
6e1574
 
6e1574
  int BN_mod_sqr(BIGNUM *r, BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
6e1574
 
6e1574
+ BIGNUM *BN_mod_sqrt(BIGNUM *in, BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
6e1574
+
6e1574
  int BN_exp(BIGNUM *r, BIGNUM *a, BIGNUM *p, BN_CTX *ctx);
6e1574
 
6e1574
  int BN_mod_exp(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
6e1574
@@ -87,6 +89,12 @@ L<BN_mod_mul_reciprocal(3)>.
6e1574
 BN_mod_sqr() takes the square of I modulo B<m> and places the
6e1574
 result in I<r>.
6e1574
 
6e1574
+BN_mod_sqrt() returns the modular square root of I such that
6e1574
+C<in^2 = a (mod p)>. The modulus I

must be a

6e1574
+prime, otherwise an error or an incorrect "result" will be returned.
6e1574
+The result is stored into I<in> which can be NULL. The result will be
6e1574
+newly allocated in that case.
6e1574
+
6e1574
 BN_exp() raises I to the I

-th power and places the result in I<r>

6e1574
 (C<r=a^p>). This function is faster than repeated applications of
6e1574
 BN_mul().
6e1574
@@ -108,7 +116,10 @@ the arguments.
6e1574
 
6e1574
 =head1 RETURN VALUES
6e1574
 
6e1574
-For all functions, 1 is returned for success, 0 on error. The return
6e1574
+The BN_mod_sqrt() returns the result (possibly incorrect if I

is

6e1574
+not a prime), or NULL.
6e1574
+
6e1574
+For all remaining functions, 1 is returned for success, 0 on error. The return
6e1574
 value should always be checked (e.g., C<if (!BN_add(r,a,b)) goto err;>).
6e1574
 The error codes can be obtained by L<ERR_get_error(3)>.
6e1574
 
6e1574
diff --git a/test/bntest.c b/test/bntest.c
6e1574
index 390dd800733e..1cab660bcafb 100644
6e1574
--- a/test/bntest.c
6e1574
+++ b/test/bntest.c
6e1574
@@ -1729,8 +1729,17 @@ static int file_modsqrt(STANZA *s)
6e1574
             || !TEST_ptr(ret2 = BN_new()))
6e1574
         goto err;
6e1574
 
6e1574
+    if (BN_is_negative(mod_sqrt)) {
6e1574
+        /* A negative testcase */
6e1574
+        if (!TEST_ptr_null(BN_mod_sqrt(ret, a, p, ctx)))
6e1574
+            goto err;
6e1574
+
6e1574
+        st = 1;
6e1574
+        goto err;
6e1574
+    }
6e1574
+
6e1574
     /* There are two possible answers. */
6e1574
-    if (!TEST_true(BN_mod_sqrt(ret, a, p, ctx))
6e1574
+    if (!TEST_ptr(BN_mod_sqrt(ret, a, p, ctx))
6e1574
             || !TEST_true(BN_sub(ret2, p, ret)))
6e1574
         goto err;
6e1574
 
6e1574
diff --git a/test/recipes/10-test_bn_data/bnmod.txt b/test/recipes/10-test_bn_data/bnmod.txt
6e1574
index 5ea4d031f271..e28cc6bfb02e 100644
6e1574
--- a/test/recipes/10-test_bn_data/bnmod.txt
6e1574
+++ b/test/recipes/10-test_bn_data/bnmod.txt
6e1574
@@ -2799,3 +2799,15 @@ P = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f
6e1574
 ModSqrt = a1d52989f12f204d3d2167d9b1e6c8a6174c0c786a979a5952383b7b8bd186
6e1574
 A = 2eee37cf06228a387788188e650bc6d8a2ff402931443f69156a29155eca07dcb45f3aac238d92943c0c25c896098716baa433f25bd696a142f5a69d5d937e81
6e1574
 P = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f
6e1574
+
6e1574
+# Negative testcases for BN_mod_sqrt()
6e1574
+
6e1574
+# This one triggers an infinite loop with unfixed implementation
6e1574
+# It should just fail.
6e1574
+ModSqrt = -1
6e1574
+A = 20a7ee
6e1574
+P = 460201
6e1574
+
6e1574
+ModSqrt = -1
6e1574
+A = 65bebdb00a96fc814ec44b81f98b59fba3c30203928fa5214c51e0a97091645280c947b005847f239758482b9bfc45b066fde340d1fe32fc9c1bf02e1b2d0ed
6e1574
+P = 9df9d6cc20b8540411af4e5357ef2b0353cb1f2ab5ffc3e246b41c32f71e951f