[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  34ff74eb183519ccedf11c97e754450469707951 (commit)
      from  5839185cdd9b339ff741da437d964a25e72a3fb6 (commit)


- Log -----------------------------------------------------------------
commit 34ff74eb183519ccedf11c97e754450469707951
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Feb 26 19:34:42 2018 +0000

    Clear some sslapitest global variables after use
    
    Otherwise we get a use after free if the test order is randomised.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5467)

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

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

diff --git a/test/sslapitest.c b/test/sslapitest.c
index 1cf5c4f..6480885 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -3227,6 +3227,7 @@ static int test_export_key_mat_early(int idx)
         SSL_SESSION_free(sess);
     SSL_SESSION_free(clientpsk);
     SSL_SESSION_free(serverpsk);
+    clientpsk = serverpsk = NULL;
     SSL_free(serverssl);
     SSL_free(clientssl);
     SSL_CTX_free(sctx);