[openssl-commits] [openssl] master update

[Paul I. Dale]

The branch master has been updated
       via  6bcfcf16bf6aef4f9ec267d8b86ae1bffd8deab9 (commit)
      from  a8d3dbe19b5c7e5b828792bfe7dcf8dc6d225c62 (commit)


- Log -----------------------------------------------------------------
commit 6bcfcf16bf6aef4f9ec267d8b86ae1bffd8deab9
Author: Pauli <paul.dale at oracle.com>
Date:   Mon Sep 3 07:37:38 2018 +1000

    Check the return from BN_sub() in BN_X931_generate_Xpq().
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7088)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/bn_x931p.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/bn/bn_x931p.c b/crypto/bn/bn_x931p.c
index 2331b01..a197cdc 100644
--- a/crypto/bn/bn_x931p.c
+++ b/crypto/bn/bn_x931p.c
@@ -184,8 +184,10 @@ int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx)
     for (i = 0; i < 1000; i++) {
         if (!BN_priv_rand(Xq, nbits, BN_RAND_TOP_TWO, BN_RAND_BOTTOM_ANY))
             goto err;
+
         /* Check that |Xp - Xq| > 2^(nbits - 100) */
-        BN_sub(t, Xp, Xq);
+        if (!BN_sub(t, Xp, Xq))
+            goto err;
         if (BN_num_bits(t) > (nbits - 100))
             break;
     }