From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 7 May 2021 14:56:34 +0000 (+0200)
Subject: Drop ASN1_PKEY_CTRL_SUPPORTS_MD_NID
X-Git-Tag: openssl-3.0.0-alpha17~131
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=3c39bd9b89198c6b3834c369c7da6f582788f645

Drop ASN1_PKEY_CTRL_SUPPORTS_MD_NID

This is a legacy ASN1_PKEY_CTRL that was added after
1.1.1 and is not needed.

Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15198)
---

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 5cfc7405f3..d997ae80e1 100644
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -1337,9 +1337,8 @@ int EVP_PKEY_get_group_name(const EVP_PKEY *pkey, char *gname, size_t gname_sz,
 
 int EVP_PKEY_supports_digest_nid(EVP_PKEY *pkey, int nid)
 {
-    int rv, default_nid;
+    int rv = -2, default_nid;
 
-    rv = evp_pkey_asn1_ctrl(pkey, ASN1_PKEY_CTRL_SUPPORTS_MD_NID, nid, NULL);
     if (rv == -2) {
         /*
          * If there is a mandatory default digest and this isn't it, then
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 9d4867ea99..e17dec8a2c 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -1513,8 +1513,7 @@ int EVP_PBE_get(int *ptype, int *ppbe_nid, size_t num);
 
 # define ASN1_PKEY_CTRL_SET1_TLS_ENCPT   0x9
 # define ASN1_PKEY_CTRL_GET1_TLS_ENCPT   0xa
-# define ASN1_PKEY_CTRL_SUPPORTS_MD_NID  0xb
-# define ASN1_PKEY_CTRL_CMS_IS_RI_TYPE_SUPPORTED 0xc
+# define ASN1_PKEY_CTRL_CMS_IS_RI_TYPE_SUPPORTED 0xb
 
 int EVP_PKEY_asn1_get_count(void);
 const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx);