[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Rich Salz]

The branch OpenSSL_1_1_0-stable has been updated
       via  388105fff3a3290806f411f0ea1d384adecb7ffa (commit)
      from  ded1b50f83c4d0d3e12a2a64d3bd66a27884136e (commit)


- Log -----------------------------------------------------------------
commit 388105fff3a3290806f411f0ea1d384adecb7ffa
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Tue Jun 13 21:22:45 2017 +0200

    Fix a possible crash in dsa_builtin_paramgen2.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3675)
    (cherry picked from commit fb0a64126b8c11a6961dfa1323c3602b591af7df)

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

Summary of changes:
 crypto/dsa/dsa_gen.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c
index 3efeab8..e58ad8d 100644
--- a/crypto/dsa/dsa_gen.c
+++ b/crypto/dsa/dsa_gen.c
@@ -376,6 +376,8 @@ int dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N,
     } else {
         p = BN_CTX_get(ctx);
         q = BN_CTX_get(ctx);
+        if (q == NULL)
+            goto err;
     }
 
     if (!BN_lshift(test, BN_value_one(), L - 1))