diff options
author | Tomas Mraz <tomas@openssl.org> | 2021-03-26 17:53:00 +0100 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-04-01 14:39:53 +0200 |
commit | 83abd33cf7b3ed40fb94aa1338b6c40b44fa8ad3 (patch) | |
tree | 958aea8cc149b5fd6e567a8bf05baccccbe96e03 /crypto/evp/evp_enc.c | |
parent | e2e20129a9b9f898d382d199f9debdb549b882ff (diff) |
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)
Diffstat (limited to 'crypto/evp/evp_enc.c')
-rw-r--r-- | crypto/evp/evp_enc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index c3d2b97594..79ffd2275f 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) { |