[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  4f5b222b84432a11c44d8c9a11c7fa98351db79b (commit)
      from  3786d74868fe440250f902ce1a78974136ca9304 (commit)


- Log -----------------------------------------------------------------
commit 4f5b222b84432a11c44d8c9a11c7fa98351db79b
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Fri Sep 25 13:50:25 2020 +1000

    Fix bug in EDDSA speed test
    
    The pkey created in one loop was being fed into the keygen of the next loop - since it was not set to NULL after the
    free. This meant that the 2 EVP_MD_CTX objects that still had ref counts to this key were getting confused.
    
    All other tests clear the key after freeing the key if they loop (some do this by declaring/initing the pkey inside the loop).
    The offending code is a recent addition to the speed app.
    This was found using the -async_jobs option.
    Similar code was tried for an RSA key using 111 which resulted in the same issue.
    
    Found while trying to test issue #128867 (It is not known if this will fix that issue yet).
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12975)

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

Summary of changes:
 apps/speed.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/speed.c b/apps/speed.c
index 017c5a280a..46187010d5 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -3426,6 +3426,7 @@ int speed_main(int argc, char **argv)
             }
 
             EVP_PKEY_free(ed_pkey);
+            ed_pkey = NULL;
         }
         if (st == 0) {
             BIO_printf(bio_err, "EdDSA failure.\n");