From 946bdd12a0b366d9d558ec8088f89124bbe42cc3 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Mon, 1 Mar 2021 16:55:23 +0100 Subject: include/crypto: Remove TODOs that are irrelevant for 3.0 The legacy support will not be removed in 3.0. Remove the related TODO 3.0 marks. Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14404) --- include/crypto/evp.h | 6 ++---- include/crypto/modes.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 9115f47c1f..41487d2af2 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -235,7 +235,6 @@ struct evp_md_st { int type; /* Legacy structure members */ - /* TODO(3.0): Remove these */ int pkey_type; int md_size; unsigned long flags; @@ -250,7 +249,7 @@ struct evp_md_st { int (*md_ctrl) (EVP_MD_CTX *ctx, int cmd, int p1, void *p2); /* New structure members */ - /* TODO(3.0): Remove above comment when legacy has gone */ + /* Above comment to be removed when legacy has gone */ int name_id; OSSL_PROVIDER *prov; CRYPTO_REF_COUNT refcnt; @@ -280,7 +279,6 @@ struct evp_cipher_st { int iv_len; /* Legacy structure members */ - /* TODO(3.0): Remove these */ /* Various flags */ unsigned long flags; /* init key */ @@ -303,7 +301,7 @@ struct evp_cipher_st { void *app_data; /* New structure members */ - /* TODO(3.0): Remove above comment when legacy has gone */ + /* Above comment to be removed when legacy has gone */ int name_id; OSSL_PROVIDER *prov; CRYPTO_REF_COUNT refcnt; diff --git a/include/crypto/modes.h b/include/crypto/modes.h index f5397fca68..119314d172 100644 --- a/include/crypto/modes.h +++ b/include/crypto/modes.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -/* TODO(3.0) Move this header into provider when dependencies are removed */ +/* This header can move into provider when legacy support is removed */ #include #if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__) -- cgit v1.2.3