QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-03 13:09:38 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fixes #14393

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14703)
This commit is contained in:
Tomas Mraz 2021-03-26 17:53:00 +01:00
parent e2e20129a9
commit 83abd33cf7
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/evp/evp_enc.c
View File

@ -1415,7 +1415,7 @@ EVP_CIPHER *evp_cipher_new(void)
* NIDs or any functionality that use them. * NIDs or any functionality that use them.
*/ */
#ifndef FIPS_MODULE #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) static void set_legacy_nid(const char *name, void *vlegacy_nid)
{ {
int nid; int nid;
@ -1453,7 +1453,6 @@ static void *evp_cipher_from_dispatch(const int name_id,
} }
#ifndef FIPS_MODULE #ifndef FIPS_MODULE
/* TODO(3.x) get rid of the need for legacy NIDs */
cipher->nid = NID_undef; cipher->nid = NID_undef;
if (!evp_names_do_all(prov, name_id, set_legacy_nid, &cipher->nid) if (!evp_names_do_all(prov, name_id, set_legacy_nid, &cipher->nid)
|| cipher->nid == -1) { || cipher->nid == -1) {