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 <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14367)
This commit is contained in:
Tomas Mraz 2021-02-26 15:31:23 +01:00 committed by Pauli
parent 5e2f580d4a
commit f378755d62

View File

@ -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,