OBJ_nid2sn(NID_sha256) is completely equivalent to OSSL_DIGEST_NAME_SHA2_256

The comment is bogus as that call for NID_sha256 does not do
anything else than looking up the string in an internal table.

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:50:03 +01:00
parent 0a4a48a8b4
commit e2e20129a9

View File

@ -4275,12 +4275,8 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
if (prefer_sha256) {
const SSL_CIPHER *tmp = sk_SSL_CIPHER_value(allow, ii);
/*
* TODO: When there are no more legacy digests we can just use
* OSSL_DIGEST_NAME_SHA2_256 instead of calling OBJ_nid2sn
*/
if (EVP_MD_is_a(ssl_md(s->ctx, tmp->algorithm2),
OBJ_nid2sn(NID_sha256))) {
OSSL_DIGEST_NAME_SHA2_256)) {
ret = tmp;
break;
}