[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  cf3306dc6b37cc24ea50cebc227a9354fefce158 (commit)
      from  628d2d3a7f2318b6a6a1c36f9d8d12032c69a9dd (commit)


- Log -----------------------------------------------------------------
commit cf3306dc6b37cc24ea50cebc227a9354fefce158
Author: Jon Spillett <jon.spillett at oracle.com>
Date:   Wed Mar 17 13:59:29 2021 +1000

    Remove TODO comment. Resolves #14396
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14588)

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

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

diff --git a/crypto/evp/ec_support.c b/crypto/evp/ec_support.c
index b06157098f..24337a5eac 100644
--- a/crypto/evp/ec_support.c
+++ b/crypto/evp/ec_support.c
@@ -122,13 +122,6 @@ const char *ossl_ec_curve_nid2name(int nid)
     if (nid <= 0)
         return NULL;
 
-    /*
-     * TODO(3.0) Figure out if we should try to find the nid with
-     * EC_curve_nid2nist() first, i.e. make it a priority to return
-     * NIST names if there is one for the NID.  This is related to
-     * the TODO comment in ossl_ec_curve_name2nid().
-     */
-
     for (i = 0; i < OSSL_NELEM(curve_list); i++) {
         if (curve_list[i].nid == nid)
             return curve_list[i].name;