From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 26 Mar 2021 16:53:00 +0000 (+0100)
Subject: Drop TODO 3.0 as we cannot get rid of legacy nids in 3.0
X-Git-Tag: openssl-3.0.0-alpha14~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83abd33cf7b3ed40fb94aa1338b6c40b44fa8ad3;p=thirdparty%2Fopenssl.git

Drop TODO 3.0 as we cannot get rid of legacy nids in 3.0

Fixes #14393

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14703)
---

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index c3d2b97594a..79ffd2275ff 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -1415,7 +1415,7 @@ EVP_CIPHER *evp_cipher_new(void)
  * NIDs or any functionality that use them.
  */
 #ifndef FIPS_MODULE
-/* TODO(3.x) get rid of the need for legacy NIDs */
+/* After removal of legacy support get rid of the need for legacy NIDs */
 static void set_legacy_nid(const char *name, void *vlegacy_nid)
 {
     int nid;
@@ -1453,7 +1453,6 @@ static void *evp_cipher_from_dispatch(const int name_id,
     }
 
 #ifndef FIPS_MODULE
-    /* TODO(3.x) get rid of the need for legacy NIDs */
     cipher->nid = NID_undef;
     if (!evp_names_do_all(prov, name_id, set_legacy_nid, &cipher->nid)
             || cipher->nid == -1) {