Rename also the OSSL_PROVIDER_name() function

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

diff --git a/apps/list.c b/apps/list.c
index bc21c7f18ac4f86e272cf59c4debc10dad2f9785..2b2676b2cd5c847ee2bde88a56d300bb9bee87f9 100644 (file)
--- a/apps/list.c
+++ b/apps/list.c
@@ -91,8 +91,8 @@ static int cipher_cmp(const EVP_CIPHER * const *a,
     int ret = EVP_CIPHER_get_number(*a) - EVP_CIPHER_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(EVP_CIPHER_get0_provider(*a)),
-                     OSSL_PROVIDER_name(EVP_CIPHER_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(*b)));
 
     return ret;
 }
@@ -138,7 +138,7 @@ static void list_ciphers(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_name(EVP_CIPHER_get0_provider(c)));
+                       OSSL_PROVIDER_get0_name(EVP_CIPHER_get0_provider(c)));
 
             if (verbose) {
                 const char *desc = EVP_CIPHER_get0_description(c);
@@ -180,8 +180,8 @@ static int md_cmp(const EVP_MD * const *a, const EVP_MD * const *b)
     int ret = EVP_MD_get_number(*a) - EVP_MD_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(EVP_MD_get0_provider(*a)),
-                     OSSL_PROVIDER_name(EVP_MD_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(*b)));
 
     return ret;
 }
@@ -227,7 +227,7 @@ static void list_digests(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_name(EVP_MD_get0_provider(m)));
+                       OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(m)));
 
             if (verbose) {
                 const char *desc = EVP_MD_get0_description(m);
@@ -253,8 +253,8 @@ static int mac_cmp(const EVP_MAC * const *a, const EVP_MAC * const *b)
     int ret = EVP_MAC_get_number(*a) - EVP_MAC_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(EVP_MAC_get0_provider(*a)),
-                     OSSL_PROVIDER_name(EVP_MAC_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(*b)));
 
     return ret;
 }
@@ -293,7 +293,7 @@ static void list_macs(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_name(EVP_MAC_get0_provider(m)));
+                       OSSL_PROVIDER_get0_name(EVP_MAC_get0_provider(m)));
 
             if (verbose) {
                 const char *desc = EVP_MAC_get0_description(m);
@@ -322,8 +322,8 @@ static int kdf_cmp(const EVP_KDF * const *a, const EVP_KDF * const *b)
     int ret = EVP_KDF_get_number(*a) - EVP_KDF_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(EVP_KDF_get0_provider(*a)),
-                     OSSL_PROVIDER_name(EVP_KDF_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(*b)));
 
     return ret;
 }
@@ -362,7 +362,7 @@ static void list_kdfs(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_name(EVP_KDF_get0_provider(k)));
+                       OSSL_PROVIDER_get0_name(EVP_KDF_get0_provider(k)));
 
             if (verbose) {
                 const char *desc = EVP_KDF_get0_description(k);
@@ -392,8 +392,8 @@ static int rand_cmp(const EVP_RAND * const *a, const EVP_RAND * const *b)
     int ret = strcasecmp(EVP_RAND_get0_name(*a), EVP_RAND_get0_name(*b));
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(EVP_RAND_get0_provider(*a)),
-                     OSSL_PROVIDER_name(EVP_RAND_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(*b)));
 
     return ret;
 }
@@ -427,7 +427,7 @@ static void list_random_generators(void)
             continue;
         BIO_printf(bio_out, "  %s", EVP_RAND_get0_name(m));
         BIO_printf(bio_out, " @ %s\n",
-                   OSSL_PROVIDER_name(EVP_RAND_get0_provider(m)));
+                   OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(m)));
 
         if (verbose) {
             const char *desc = EVP_RAND_get0_description(m);
@@ -460,7 +460,7 @@ static void display_random(const char *name, EVP_RAND_CTX *drbg)
 
         BIO_printf(bio_out, "  %s", EVP_RAND_get0_name(rand));
         BIO_printf(bio_out, " @ %s\n",
-                   OSSL_PROVIDER_name(EVP_RAND_get0_provider(rand)));
+                   OSSL_PROVIDER_get0_name(EVP_RAND_get0_provider(rand)));
 
         switch (EVP_RAND_get_state(drbg)) {
         case EVP_RAND_STATE_UNINITIALISED:
@@ -523,8 +523,8 @@ static int encoder_cmp(const OSSL_ENCODER * const *a,
     int ret = OSSL_ENCODER_get_number(*a) - OSSL_ENCODER_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(OSSL_ENCODER_get0_provider(*a)),
-                     OSSL_PROVIDER_name(OSSL_ENCODER_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(*b)));
     return ret;
 }
 
@@ -564,7 +564,7 @@ static void list_encoders(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s (%s)\n",
-                    OSSL_PROVIDER_name(OSSL_ENCODER_get0_provider(k)),
+                    OSSL_PROVIDER_get0_name(OSSL_ENCODER_get0_provider(k)),
                     OSSL_ENCODER_get0_properties(k));
 
             if (verbose) {
@@ -591,8 +591,8 @@ static int decoder_cmp(const OSSL_DECODER * const *a,
     int ret = OSSL_DECODER_get_number(*a) - OSSL_DECODER_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(OSSL_DECODER_get0_provider(*a)),
-                     OSSL_PROVIDER_name(OSSL_DECODER_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(*b)));
     return ret;
 }
 
@@ -633,7 +633,7 @@ static void list_decoders(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s (%s)\n",
-                       OSSL_PROVIDER_name(OSSL_DECODER_get0_provider(k)),
+                       OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(k)),
                        OSSL_DECODER_get0_properties(k));
 
             if (verbose) {
@@ -657,8 +657,8 @@ static int keymanager_cmp(const EVP_KEYMGMT * const *a,
     int ret = EVP_KEYMGMT_get_number(*a) - EVP_KEYMGMT_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(EVP_KEYMGMT_get0_provider(*a)),
-                     OSSL_PROVIDER_name(EVP_KEYMGMT_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(*b)));
     return ret;
 }
 
@@ -700,7 +700,7 @@ static void list_keymanagers(void)
             BIO_printf(bio_out, "    IDs: ");
             print_names(bio_out, names);
             BIO_printf(bio_out, " @ %s\n",
-                    OSSL_PROVIDER_name(EVP_KEYMGMT_get0_provider(k)));
+                    OSSL_PROVIDER_get0_name(EVP_KEYMGMT_get0_provider(k)));
 
             if (verbose) {
                 print_param_types("settable key generation parameters",
@@ -723,8 +723,8 @@ static int signature_cmp(const EVP_SIGNATURE * const *a,
     int ret = EVP_SIGNATURE_get_number(*a) - EVP_SIGNATURE_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(EVP_SIGNATURE_get0_provider(*a)),
-                     OSSL_PROVIDER_name(EVP_SIGNATURE_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(*b)));
     return ret;
 }
 
@@ -759,7 +759,7 @@ static void list_signatures(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                    OSSL_PROVIDER_name(EVP_SIGNATURE_get0_provider(k)));
+                    OSSL_PROVIDER_get0_name(EVP_SIGNATURE_get0_provider(k)));
 
             if (verbose) {
                 const char *desc = EVP_SIGNATURE_get0_description(k);
@@ -786,8 +786,8 @@ static int kem_cmp(const EVP_KEM * const *a,
     int ret = EVP_KEM_get_number(*a) - EVP_KEM_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(EVP_KEM_get0_provider(*a)),
-                     OSSL_PROVIDER_name(EVP_KEM_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(*b)));
     return ret;
 }
 
@@ -822,7 +822,7 @@ static void list_kems(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_name(EVP_KEM_get0_provider(k)));
+                       OSSL_PROVIDER_get0_name(EVP_KEM_get0_provider(k)));
 
             if (verbose) {
                 const char *desc = EVP_KEM_get0_description(k);
@@ -849,8 +849,8 @@ static int asymcipher_cmp(const EVP_ASYM_CIPHER * const *a,
     int ret = EVP_ASYM_CIPHER_get_number(*a) - EVP_ASYM_CIPHER_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(EVP_ASYM_CIPHER_get0_provider(*a)),
-                     OSSL_PROVIDER_name(EVP_ASYM_CIPHER_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(*b)));
     return ret;
 }
 
@@ -887,7 +887,7 @@ static void list_asymciphers(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                    OSSL_PROVIDER_name(EVP_ASYM_CIPHER_get0_provider(k)));
+                    OSSL_PROVIDER_get0_name(EVP_ASYM_CIPHER_get0_provider(k)));
 
             if (verbose) {
                 const char *desc = EVP_ASYM_CIPHER_get0_description(k);
@@ -914,8 +914,8 @@ static int kex_cmp(const EVP_KEYEXCH * const *a,
     int ret = EVP_KEYEXCH_get_number(*a) - EVP_KEYEXCH_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(EVP_KEYEXCH_get0_provider(*a)),
-                     OSSL_PROVIDER_name(EVP_KEYEXCH_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(*b)));
     return ret;
 }
 
@@ -950,7 +950,7 @@ static void list_keyexchanges(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                    OSSL_PROVIDER_name(EVP_KEYEXCH_get0_provider(k)));
+                    OSSL_PROVIDER_get0_name(EVP_KEYEXCH_get0_provider(k)));
 
             if (verbose) {
                 const char *desc = EVP_KEYEXCH_get0_description(k);
@@ -1199,8 +1199,8 @@ static int store_cmp(const OSSL_STORE_LOADER * const *a,
     int ret = OSSL_STORE_LOADER_get_number(*a) - OSSL_STORE_LOADER_get_number(*b);
 
     if (ret == 0)
-        ret = strcmp(OSSL_PROVIDER_name(OSSL_STORE_LOADER_get0_provider(*a)),
-                     OSSL_PROVIDER_name(OSSL_STORE_LOADER_get0_provider(*b)));
+        ret = strcmp(OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(*a)),
+                     OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(*b)));
 
     return ret;
 }
@@ -1239,7 +1239,7 @@ static void list_store_loaders(void)
             print_names(bio_out, names);
 
             BIO_printf(bio_out, " @ %s\n",
-                       OSSL_PROVIDER_name(OSSL_STORE_LOADER_get0_provider(m)));
+                       OSSL_PROVIDER_get0_name(OSSL_STORE_LOADER_get0_provider(m)));
         }
         sk_OPENSSL_CSTRING_free(names);
     }
@@ -1250,7 +1250,7 @@ DEFINE_STACK_OF(OSSL_PROVIDER)
 static int provider_cmp(const OSSL_PROVIDER * const *a,
                         const OSSL_PROVIDER * const *b)
 {
-    return strcmp(OSSL_PROVIDER_name(*a), OSSL_PROVIDER_name(*b));
+    return strcmp(OSSL_PROVIDER_get0_name(*a), OSSL_PROVIDER_get0_name(*b));
 }
 
 static int collect_providers(OSSL_PROVIDER *provider, void *stack)
@@ -1295,7 +1295,7 @@ static void list_provider_info(void)
         }
 
         /* Print out the provider information, the params order matches above */
-        BIO_printf(bio_out, "  %s\n", OSSL_PROVIDER_name(prov));
+        BIO_printf(bio_out, "  %s\n", OSSL_PROVIDER_get0_name(prov));
         if (OSSL_PARAM_modified(params))
             BIO_printf(bio_out, "    name: %s\n", name);
         if (OSSL_PARAM_modified(params + 1))

diff --git a/crypto/provider.c b/crypto/provider.c
index 766086a47b3bb7a54116f1cbe984e3ef3e7f0082..52647b2e77e3f6a43725492a5aa7b01d198b50fa 100644 (file)
--- a/crypto/provider.c
+++ b/crypto/provider.c
@@ -129,7 +129,7 @@ int OSSL_PROVIDER_add_builtin(OSSL_LIB_CTX *libctx, const char *name,
     return 1;
 }
 
-const char *OSSL_PROVIDER_name(const OSSL_PROVIDER *prov)
+const char *OSSL_PROVIDER_get0_name(const OSSL_PROVIDER *prov)
 {
     return ossl_provider_name(prov);
 }

diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index ca2bfdb8fac28d3c5f9bdfacefcd097e6c7b53ad..eac5b589462be8e50cc24ea81d72aa7ccd5eacb4 100644 (file)
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -1729,7 +1729,7 @@ static const OSSL_DISPATCH core_dispatch_[] = {
     { OSSL_FUNC_PROVIDER_DEREGISTER_CHILD_CB,
         (void (*)(void))ossl_provider_deregister_child_cb },
     { OSSL_FUNC_PROVIDER_NAME,
-        (void (*)(void))OSSL_PROVIDER_name },
+        (void (*)(void))OSSL_PROVIDER_get0_name },
     { OSSL_FUNC_PROVIDER_GET0_PROVIDER_CTX,
         (void (*)(void))OSSL_PROVIDER_get0_provider_ctx },
     { OSSL_FUNC_PROVIDER_GET0_DISPATCH,

diff --git a/doc/man3/OSSL_DECODER.pod b/doc/man3/OSSL_DECODER.pod
index 039f77848b5cd1e1f877b2354a63c175c901528f..10917ed462dab30c2f4b82646c7443574923d7c7 100644 (file)
--- a/doc/man3/OSSL_DECODER.pod
+++ b/doc/man3/OSSL_DECODER.pod
@@ -167,7 +167,7 @@ To list all decoders in a provider to a bio_out:
  for (i = 0; i < sk_OSSL_DECODER_num(decoders); i++) {
      OSSL_DECODER *decoder = sk_OSSL_DECODER_value(decoders, i);
 
-     if (strcmp(OSSL_PROVIDER_name(OSSL_DECODER_get0_provider(decoder)),
+     if (strcmp(OSSL_PROVIDER_get0_name(OSSL_DECODER_get0_provider(decoder)),
                 provider) != 0)
          continue;
 

diff --git a/doc/man3/OSSL_PROVIDER.pod b/doc/man3/OSSL_PROVIDER.pod
index 391084e68eedaa79c0dbc2d28afc460ffaaa01d2..2b014c467177eacd75d6f16890cbbc8fd5e5e866 100644 (file)
--- a/doc/man3/OSSL_PROVIDER.pod
+++ b/doc/man3/OSSL_PROVIDER.pod
@@ -8,7 +8,7 @@ OSSL_PROVIDER_available, OSSL_PROVIDER_do_all,
 OSSL_PROVIDER_gettable_params, OSSL_PROVIDER_get_params,
 OSSL_PROVIDER_query_operation, OSSL_PROVIDER_unquery_operation,
 OSSL_PROVIDER_get0_provider_ctx, OSSL_PROVIDER_get0_dispatch,
-OSSL_PROVIDER_add_builtin, OSSL_PROVIDER_name, OSSL_PROVIDER_get_capabilities,
+OSSL_PROVIDER_add_builtin, OSSL_PROVIDER_get0_name, OSSL_PROVIDER_get_capabilities,
 OSSL_PROVIDER_self_test
 - provider routines
 
@@ -45,7 +45,7 @@ OSSL_PROVIDER_self_test
  int OSSL_PROVIDER_add_builtin(OSSL_LIB_CTX *libctx, const char *name,
                                ossl_provider_init_fn *init_fn);
 
- const char *OSSL_PROVIDER_name(const OSSL_PROVIDER *prov);
+ const char *OSSL_PROVIDER_get0_name(const OSSL_PROVIDER *prov);
 
  int OSSL_PROVIDER_get_capabilities(const OSSL_PROVIDER *prov,
                                     const char *capability,
@@ -140,7 +140,7 @@ If it is permissible to cache references to this array then I<*no_store> is set
 to 0 or 1 otherwise. If the array is not cacheable then it is assumed to
 have a short lifetime.
 
-OSSL_PROVIDER_name() returns the name of the given provider.
+OSSL_PROVIDER_get0_name() returns the name of the given provider.
 
 OSSL_PROVIDER_get_capabilities() provides information about the capabilities
 supported by the provider specified in I<prov> with the capability name

diff --git a/doc/man7/fips_module.pod b/doc/man7/fips_module.pod
index 82d245a8bc619b5a1ba30c75f0bfebb861a5c6f8..8133f01eafa34bc324633509b4aff2b4818d4b3a 100644 (file)
--- a/doc/man7/fips_module.pod
+++ b/doc/man7/fips_module.pod
@@ -447,7 +447,8 @@ example of a digest is used.
 To go from an B<EVP_MD_CTX> to an B<EVP_MD>, use L<EVP_MD_CTX_md(3)> .
 To go from the B<EVP_MD> to its B<OSSL_PROVIDER>,
 use L<EVP_MD_get0_provider(3)>.
-To extract the name from the B<OSSL_PROVIDER>, use L<OSSL_PROVIDER_name(3)>.
+To extract the name from the B<OSSL_PROVIDER>, use
+L<OSSL_PROVIDER_get0_name(3)>.
 
 =head1 SEE ALSO
 

diff --git a/include/openssl/provider.h b/include/openssl/provider.h
index e66d5324af7d86d2cc2e893f9e90a9bad7e262ce..dc86ff5878c97cbefceb6e3ae537a0bc930d32bc 100644 (file)
--- a/include/openssl/provider.h
+++ b/include/openssl/provider.h
@@ -51,7 +51,7 @@ int OSSL_PROVIDER_add_builtin(OSSL_LIB_CTX *, const char *name,
                               OSSL_provider_init_fn *init_fn);
 
 /* Information */
-const char *OSSL_PROVIDER_name(const OSSL_PROVIDER *prov);
+const char *OSSL_PROVIDER_get0_name(const OSSL_PROVIDER *prov);
 
 # ifdef __cplusplus
 }

diff --git a/test/defltfips_test.c b/test/defltfips_test.c
index a2325a19fc2bf0d8cd5e1323640b31c08af20ad9..21c5e1524da6575c23dc6a88ac06e64722f3adab 100644 (file)
--- a/test/defltfips_test.c
+++ b/test/defltfips_test.c
@@ -36,8 +36,8 @@ static int test_is_fips_enabled(void)
     if (!TEST_ptr(sha256))
         return 0;
     if (is_fips
-            && !TEST_str_eq(OSSL_PROVIDER_name(EVP_MD_get0_provider(sha256)),
-                                               "fips")) {
+        && !TEST_str_eq(OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(sha256)),
+                        "fips")) {
         EVP_MD_free(sha256);
         return 0;
     }

diff --git a/test/provider_fallback_test.c b/test/provider_fallback_test.c
index 0e38bd86055cef0dc521820233daed64531142a8..116a2f4965ef4a085473fce524d109e57ba5d9c1 100644 (file)
--- a/test/provider_fallback_test.c
+++ b/test/provider_fallback_test.c
@@ -21,7 +21,7 @@ static int test_provider(OSSL_LIB_CTX *ctx)
     ok = TEST_true(OSSL_PROVIDER_available(ctx, "default"))
         && TEST_ptr(rsameth = EVP_KEYMGMT_fetch(ctx, "RSA", NULL))
         && TEST_ptr(prov = EVP_KEYMGMT_get0_provider(rsameth))
-        && TEST_str_eq(OSSL_PROVIDER_name(prov), "default");
+        && TEST_str_eq(OSSL_PROVIDER_get0_name(prov), "default");
 
     EVP_KEYMGMT_free(rsameth);
     return ok;

diff --git a/test/provider_internal_test.c b/test/provider_internal_test.c
index 451d0f61b063459f5aa5d2e84cb07c4278799f6d..7a37ef8c241ee38832ad2832c45f6efda133049f 100644 (file)
--- a/test/provider_internal_test.c
+++ b/test/provider_internal_test.c
@@ -118,7 +118,7 @@ static int test_cache_flushes(void)
         goto err;
 
     if (!TEST_ptr_null(md = EVP_MD_fetch(ctx, "SHA256", NULL))) {
-        const char *provname = OSSL_PROVIDER_name(EVP_MD_get0_provider(md));
+        const char *provname = OSSL_PROVIDER_get0_name(EVP_MD_get0_provider(md));
 
         if (OSSL_PROVIDER_available(NULL, provname))
             TEST_info("%s provider is available\n", provname);

diff --git a/util/libcrypto.num b/util/libcrypto.num
index 112a6f6640ed5df69a445b6a4ec51c5e35300922..3d44181f227cfc9fe1a12ae41a755f485ff78b21 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -4632,7 +4632,7 @@ EVP_MD_get0_name                        4759      3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_get0_name                    4760   3_0_0   EXIST::FUNCTION:
 EVP_MD_get0_provider                    4761   3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_get0_provider                4762   3_0_0   EXIST::FUNCTION:
-OSSL_PROVIDER_name                      4763   3_0_0   EXIST::FUNCTION:
+OSSL_PROVIDER_get0_name                 4763   3_0_0   EXIST::FUNCTION:
 EVP_CIPHER_do_all_provided              4764   3_0_0   EXIST::FUNCTION:
 EVP_MD_do_all_provided                  4765   3_0_0   EXIST::FUNCTION:
 EVP_KEYEXCH_get0_provider               4766   3_0_0   EXIST::FUNCTION: