From: Tomas Mraz Date: Fri, 26 Feb 2021 14:31:23 +0000 (+0100) Subject: statem_lib.c: Remove TODOs that are unnecessary X-Git-Tag: openssl-3.0.0-alpha13~81 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f378755d62e1646b36683de37408dd98549bef69;p=thirdparty%2Fopenssl.git statem_lib.c: Remove TODOs that are unnecessary If the EVP_MD_CTX_ctrl is deprecated the code will generate deprecation warnings. So there is no point in marking all EVP_MD_CTX_ctrl() calls with TODOs. Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14367) --- diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c index ba1fe750700..a7ed843aa4e 100644 --- a/ssl/statem/statem_lib.c +++ b/ssl/statem/statem_lib.c @@ -329,10 +329,6 @@ int tls_construct_cert_verify(SSL *s, WPACKET *pkt) * in order to add the EVP_CTRL_SSL3_MASTER_SECRET call between them. */ if (EVP_DigestSignUpdate(mctx, hdata, hdatalen) <= 0 - /* - * TODO(3.0) Replace this when EVP_MD_CTX_ctrl() is deprecated - * with a call to ssl3_digest_master_key_set_params() - */ || EVP_MD_CTX_ctrl(mctx, EVP_CTRL_SSL3_MASTER_SECRET, (int)s->session->master_key_length, s->session->master_key) <= 0 @@ -520,10 +516,6 @@ MSG_PROCESS_RETURN tls_process_cert_verify(SSL *s, PACKET *pkt) } } if (s->version == SSL3_VERSION) { - /* - * TODO(3.0) Replace this when EVP_MD_CTX_ctrl() is deprecated - * with a call to ssl3_digest_master_key_set_params() - */ if (EVP_DigestVerifyUpdate(mctx, hdata, hdatalen) <= 0 || EVP_MD_CTX_ctrl(mctx, EVP_CTRL_SSL3_MASTER_SECRET, (int)s->session->master_key_length,