TMP! fixit

beldmit · Jan 20, 2025 · e9b2eee · e9b2eee
1 parent 16b7ffc
commit e9b2eee
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 16 deletions.
diff --git a/apps/enc.c b/apps/enc.c
@@ -757,7 +757,6 @@ int enc_main(int argc, char **argv)
 
                 BIO_printf(bio_out, "An opaque key identified by %s is created\n",
                            key_name ? key_name : "<unknown>");
-                BIO_printf(bio_out, "Provider: %s\n", EVP_SKEY_get0_provider_name(skey));
                 BIO_printf(bio_out, "Key management: %s\n", EVP_SKEY_get0_skeymgmt_name(skey));
                 OPENSSL_free(skey);
             }

diff --git a/crypto/evp/s_lib.c b/crypto/evp/s_lib.c
@@ -244,11 +244,3 @@ const char *EVP_SKEY_get0_skeymgmt_name(const EVP_SKEY *skey)
     return skey->skeymgmt->type_name;
 
 }
-
-const char *EVP_SKEY_get0_provider_name(const EVP_SKEY *skey)
-{
-    if (skey == NULL)
-        return NULL;
-
-    return OSSL_PROVIDER_get0_name(skey->skeymgmt->prov);
-}
diff --git a/doc/man3/EVP_SKEY.pod b/doc/man3/EVP_SKEY.pod
@@ -5,7 +5,7 @@
 EVP_SKEY, EVP_SKEY_generate,
 EVP_SKEY_import, EVP_SKEY_new_raw_key, EVP_SKEY_up_ref,
 EVP_SKEY_export, EVP_SKEY_get_raw_key, EVP_SKEY_get1_key_id,
-EVP_SKEY_get0_skeymgmt_name, EVP_SKEY_get0_provider_name,
+EVP_SKEY_get0_skeymgmt_name,
 EVP_SKEY_free
 - opaque symmetric key allocation and handling functions
 
@@ -27,7 +27,6 @@ EVP_SKEY_free
  char *EVP_SKEY_get1_key_id(const EVP_SKEY *skey);
 
  const char *EVP_SKEY_get0_skeymgmt_name(const EVP_SKEY *skey);
- const char *EVP_SKEY_get0_provider_name(const EVP_SKEY *skey);
 
  int EVP_SKEY_up_ref(EVP_SKEY *key);
  void EVP_SKEY_free(EVP_SKEY *key);
@@ -69,7 +68,7 @@ The EVP_SKEY_get1_key_id() returns a 0-terminated string providing some
 human-readable identifier of the key if provided by the underlying key
 management. The result of this function should be freed.
 
-The EVP_SKEY_get0_skeymgmt_name() and EVP_SKEY_get0_provider_name() return the
+The EVP_SKEY_get0_skeymgmt_name() returns the
 names of the associated EVP_SKEYMGMT object and its provider correspondigly.
 
 EVP_SKEY_up_ref() increments the reference count of I<key>.
@@ -114,7 +113,7 @@ EVP_SKEY_up_ref() returns 1 for success and 0 for failure.
 
 EVP_SKEY_export() and EVP_SKEY_get_raw_key() return 1 for success and 0 for failure.
 
-EVP_SKEY_get0_skeymgmt_name() and EVP_SKEY_get0_provider_name() return the
+EVP_SKEY_get0_skeymgmt_name() returns the
 names of the associated EVP_SKEYMGMT object and its provider correspondigly.
 
 =head1 SEE ALSO
@@ -126,7 +125,7 @@ L<EVP_SKEYMGMT(3)>, L<provider(7)>, L<OSSL_PARAM(3)>
 The B<EVP_SKEY> API and functions EVP_SKEY_export(),
 EVP_SKEY_free(), EVP_SKEY_get_raw_key(), EVP_SKEY_import(),
 EVP_SKEY_new_raw_key(), EVP_SKEY_up_ref(), EVP_SKEY_generate(),
-EVP_SKEY_get1_key_id(), EVP_SKEY_get0_provider_name(), and
+EVP_SKEY_get1_key_id(), and
 EVP_SKEY_get0_skeymgmt_name()
 were introduced in OpenSSL 3.5.
 

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
@@ -2281,7 +2281,6 @@ int EVP_SKEY_export(const EVP_SKEY *skey, int selection,
 int EVP_SKEY_up_ref(EVP_SKEY *skey);
 void EVP_SKEY_free(EVP_SKEY *skey);
 const char *EVP_SKEY_get0_skeymgmt_name(const EVP_SKEY *skey);
-const char *EVP_SKEY_get0_provider_name(const EVP_SKEY *skey);
 
 # ifdef  __cplusplus
 }

diff --git a/util/libcrypto.num b/util/libcrypto.num
@@ -5898,4 +5898,3 @@ EVP_PKEY_derive_SKEY                    ?	3_5_0	EXIST::FUNCTION:
 EVP_MAC_init_SKEY                       ?	3_5_0	EXIST::FUNCTION:
 EVP_SKEY_get1_key_id                    ?	3_5_0	EXIST::FUNCTION:
 EVP_SKEY_get0_skeymgmt_name             ?	3_5_0	EXIST::FUNCTION:
-EVP_SKEY_get0_provider_name             ?	3_5_0	EXIST::FUNCTION: