[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  50864bd2f7bcbc76cb68c46c4f4c6ce57c683a5f (commit)
      from  19ad1e9d3737f48c0e1c5cc5397ff1827b6946b8 (commit)


- Log -----------------------------------------------------------------
commit 50864bd2f7bcbc76cb68c46c4f4c6ce57c683a5f
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 15 16:55:46 2021 +0000

    Convert some TODO(3.0) comments in init.c to normal comments
    
    There is no need to make the suggested changes in the 3.0 timescale.
    These are just suggested improvements for the future.
    
    Fixes #14375
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14556)

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

Summary of changes:
 crypto/init.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/init.c b/crypto/init.c
index 3b6a16a76d..09be58ea12 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -347,8 +347,8 @@ void OPENSSL_cleanup(void)
     OPENSSL_INIT_STOP *currhandler, *lasthandler;
 
     /*
-     * TODO(3.0): This function needs looking at with a view to moving most/all
-     * of this into onfree handlers in OSSL_LIB_CTX.
+     * At some point we should consider looking at this function with a view to
+     * moving most/all of this into onfree handlers in OSSL_LIB_CTX.
      */
 
     /* If we've not been inited then no need to deinit */
@@ -488,8 +488,8 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
     }
 
     /*
-     * TODO(3.0): This function needs looking at with a view to moving most/all
-     * of this into OSSL_LIB_CTX.
+     * At some point we should look at this function with a view to moving
+     * most/all of this into OSSL_LIB_CTX.
      */
 
     if (stopped) {