[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ba4341316ce762f917f973bb4ac604062fb11724 (commit)
      from  7a5f5fd32a58e6c70cc0ce05a7d7391e4968663e (commit)


- Log -----------------------------------------------------------------
commit ba4341316ce762f917f973bb4ac604062fb11724
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Jun 20 10:38:46 2019 +0200

    test/testutil/init.c, apps/openssl.c: add trace cleanup handle earlier
    
    It turned out that the internal trace cleanup handler was added too
    late, so it would be executed before OPENSSL_cleanup().
    This results in address errors, as the trace code that's executed in
    OPENSSL_cleanup() itself tries to reach for data that's been freed at
    that point.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9196)

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

Summary of changes:
 apps/openssl.c       | 8 +++++++-
 test/testutil/init.c | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/apps/openssl.c b/apps/openssl.c
index 9c0d933..7a490cc 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -216,6 +216,13 @@ static void setup_trace(const char *str)
 {
     char *val;
 
+    /*
+     * We add this handler as early as possible to ensure it's executed
+     * as late as possible, i.e. after the TRACE code has done its cleanup
+     * (which happens last in OPENSSL_cleanup).
+     */
+    atexit(cleanup_trace);
+
     trace_data_stack = sk_tracedata_new_null();
     val = OPENSSL_strdup(str);
 
@@ -240,7 +247,6 @@ static void setup_trace(const char *str)
     }
 
     OPENSSL_free(val);
-    atexit(cleanup_trace);
 }
 #endif /* OPENSSL_NO_TRACE */
 
diff --git a/test/testutil/init.c b/test/testutil/init.c
index b4a7277..429c1a0 100644
--- a/test/testutil/init.c
+++ b/test/testutil/init.c
@@ -102,6 +102,13 @@ static void setup_trace(const char *str)
 {
     char *val;
 
+    /*
+     * We add this handler as early as possible to ensure it's executed
+     * as late as possible, i.e. after the TRACE code has done its cleanup
+     * (which happens last in OPENSSL_cleanup).
+     */
+    atexit(cleanup_trace);
+
     trace_data_stack = sk_tracedata_new_null();
     val = OPENSSL_strdup(str);
 
@@ -126,7 +133,6 @@ static void setup_trace(const char *str)
     }
 
     OPENSSL_free(val);
-    atexit(cleanup_trace);
 }
 #endif /* OPENSSL_NO_TRACE */