[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  7905806c94b17b1907d5352ceb047dd8d859288c (commit)
      from  a4e440d6477b40b04ce825dae14c7f27778ca8f1 (commit)


- Log -----------------------------------------------------------------
commit 7905806c94b17b1907d5352ceb047dd8d859288c
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Wed Jun 17 17:26:47 2020 +1000

    Fix potential double free in rsa_keygen pairwise test.
    
    It should never hit this branch of code, so there is no feasible test.
    Found due to a similar issue in PR #12176.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12177)

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

Summary of changes:
 crypto/rsa/rsa_gen.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c
index e391f6419a..1cdc8d91e8 100644
--- a/crypto/rsa/rsa_gen.c
+++ b/crypto/rsa/rsa_gen.c
@@ -451,6 +451,12 @@ static int rsa_keygen(OPENSSL_CTX *libctx, RSA *rsa, int bits, int primes,
             BN_clear_free(rsa->dmp1);
             BN_clear_free(rsa->dmq1);
             BN_clear_free(rsa->iqmp);
+            rsa->d = NULL;
+            rsa->p = NULL;
+            rsa->q = NULL;
+            rsa->dmp1 = NULL;
+            rsa->dmq1 = NULL;
+            rsa->iqmp = NULL;
         }
     }
     return ok;