[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  145a4c871d9632a6eb2145f8a2b417bec58e7ee5 (commit)
      from  21d1994faf7f6e41ad3221caeab2385e3aaba892 (commit)


- Log -----------------------------------------------------------------
commit 145a4c871d9632a6eb2145f8a2b417bec58e7ee5
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Apr 15 16:32:45 2021 +0100

    Remove a TODO(3.0) from keymgmt_lib.c
    
    The TODO suggest a possible refactoring. The refactoring doesn't seem
    necessary at this stage. If it is required later it can be done without
    affecting external APIs - so just remove the TODO.
    
    Fixes #14397
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14888)

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

Summary of changes:
 crypto/evp/keymgmt_lib.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/crypto/evp/keymgmt_lib.c b/crypto/evp/keymgmt_lib.c
index f196bc4d88..f3118a76c9 100644
--- a/crypto/evp/keymgmt_lib.c
+++ b/crypto/evp/keymgmt_lib.c
@@ -123,10 +123,6 @@ void *evp_keymgmt_util_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt)
     CRYPTO_THREAD_unlock(pk->lock);
 
     /* If the "origin" |keymgmt| doesn't support exporting, give up */
-    /*
-     * TODO(3.0) consider an evp_keymgmt_export() return value that indicates
-     * that the method is unsupported.
-     */
     if (pk->keymgmt->export == NULL)
         return NULL;