[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  703c4d669d808d9131f241420c3225c1e7db3660 (commit)
      from  fadb77ce6df6f44efc9298cda8a7a22ddef636a4 (commit)


- Log -----------------------------------------------------------------
commit 703c4d669d808d9131f241420c3225c1e7db3660
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Mar 12 15:43:40 2021 +0000

    Convert a TODO(3.0) in OPENSSL_thread_stop_ex to a comment
    
    The TODO is describing something that would be nice to fix. In fact the
    problem exists even in 1.1.1. It would be nice to fix it, but it does
    not need to be done in the 3.0 timeframe.
    
    Fixes #14376
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14533)

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

Summary of changes:
 crypto/initthread.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/initthread.c b/crypto/initthread.c
index 993bf74473..0740668071 100644
--- a/crypto/initthread.c
+++ b/crypto/initthread.c
@@ -216,9 +216,9 @@ void OPENSSL_thread_stop_ex(OSSL_LIB_CTX *ctx)
 {
     ctx = ossl_lib_ctx_get_concrete(ctx);
     /*
-     * TODO(3.0). It would be nice if we could figure out a way to do this on
-     * all threads that have used the OSSL_LIB_CTX when the context is freed.
-     * This is currently not possible due to the use of thread local variables.
+     * It would be nice if we could figure out a way to do this on all threads
+     * that have used the OSSL_LIB_CTX when the context is freed. This is
+     * currently not possible due to the use of thread local variables.
      */
     ossl_ctx_thread_stop(ctx);
 }