Constify OSSL_PROVIDER getter input parameters

Some OSSL_PROVIDER getters took a non-const OSSL_PROVIDER parameter.
There's no reason to do so.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9054)

diff --git a/crypto/provider.c b/crypto/provider.c
index 823d5dd585e9c27d304c4c86ffbb2299be08f895..249502413f46ece97b293003790ad3212f4c0754 100644 (file)
--- a/crypto/provider.c
+++ b/crypto/provider.c
@@ -35,12 +35,13 @@ int OSSL_PROVIDER_unload(OSSL_PROVIDER *prov)
     return 1;
 }
 
     return 1;
 }
 

-const OSSL_ITEM *OSSL_PROVIDER_get_param_types(OSSL_PROVIDER *prov)
+const OSSL_ITEM *OSSL_PROVIDER_get_param_types(const OSSL_PROVIDER *prov)

 {
     return ossl_provider_get_param_types(prov);
 }
 
 {
     return ossl_provider_get_param_types(prov);
 }
 

-int OSSL_PROVIDER_get_params(OSSL_PROVIDER *prov, const OSSL_PARAM params[])
+int OSSL_PROVIDER_get_params(const OSSL_PROVIDER *prov,
+                             const OSSL_PARAM params[])

 {
     return ossl_provider_get_params(prov, params);
 }
 {
     return ossl_provider_get_params(prov, params);
 }

diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index d17ff93e16f81136bd74e7f0eded8b4c029e9b41..837f4b5daf115232a377bc90a199a8f7925c0e92 100644 (file)
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -575,17 +575,17 @@ int ossl_provider_set_fallback(OSSL_PROVIDER *prov)
 }
 
 /* Getters of Provider Object data */
 }
 
 /* Getters of Provider Object data */

-const char *ossl_provider_name(OSSL_PROVIDER *prov)
+const char *ossl_provider_name(const OSSL_PROVIDER *prov)

 {
     return prov->name;
 }
 
 {
     return prov->name;
 }
 

-const DSO *ossl_provider_dso(OSSL_PROVIDER *prov)
+const DSO *ossl_provider_dso(const OSSL_PROVIDER *prov)

 {
     return prov->module;
 }
 
 {
     return prov->module;
 }
 

-const char *ossl_provider_module_name(OSSL_PROVIDER *prov)
+const char *ossl_provider_module_name(const OSSL_PROVIDER *prov)

 {
 #ifdef FIPS_MODE
     return NULL;
 {
 #ifdef FIPS_MODE
     return NULL;


@@ -594,7 +594,7 @@ const char *ossl_provider_module_name(OSSL_PROVIDER *prov)
 #endif
 }
 
 #endif
 }
 

-const char *ossl_provider_module_path(OSSL_PROVIDER *prov)
+const char *ossl_provider_module_path(const OSSL_PROVIDER *prov)

 {
 #ifdef FIPS_MODE
     return NULL;
 {
 #ifdef FIPS_MODE
     return NULL;

diff --git a/include/internal/provider.h b/include/internal/provider.h
index 7b0531345d5969146db31de988064c311327a873..f48c758479736df5f7a30d434897a5c6341951e4 100644 (file)
--- a/include/internal/provider.h
+++ b/include/internal/provider.h
@@ -55,10 +55,10 @@ int ossl_provider_forall_loaded(OPENSSL_CTX *,
                                 void *cbdata);
 
 /* Getters for other library functions */
                                 void *cbdata);
 
 /* Getters for other library functions */

-const char *ossl_provider_name(OSSL_PROVIDER *prov);
-const DSO *ossl_provider_dso(OSSL_PROVIDER *prov);
-const char *ossl_provider_module_name(OSSL_PROVIDER *prov);
-const char *ossl_provider_module_path(OSSL_PROVIDER *prov);
+const char *ossl_provider_name(const OSSL_PROVIDER *prov);
+const DSO *ossl_provider_dso(const OSSL_PROVIDER *prov);
+const char *ossl_provider_module_name(const OSSL_PROVIDER *prov);
+const char *ossl_provider_module_path(const OSSL_PROVIDER *prov);

 
 /* Thin wrappers around calls to the provider */
 void ossl_provider_teardown(const OSSL_PROVIDER *prov);
 
 /* Thin wrappers around calls to the provider */
 void ossl_provider_teardown(const OSSL_PROVIDER *prov);

diff --git a/include/openssl/provider.h b/include/openssl/provider.h
index 7dc5b8ae54074fea71623f87c701f9ee79c8e9d1..ce75ee9e14ee24a21a6289434a58c249f73305ca 100644 (file)
--- a/include/openssl/provider.h
+++ b/include/openssl/provider.h
@@ -20,8 +20,9 @@ extern "C" {
 OSSL_PROVIDER *OSSL_PROVIDER_load(OPENSSL_CTX *, const char *name);
 int OSSL_PROVIDER_unload(OSSL_PROVIDER *prov);
 
 OSSL_PROVIDER *OSSL_PROVIDER_load(OPENSSL_CTX *, const char *name);
 int OSSL_PROVIDER_unload(OSSL_PROVIDER *prov);
 

-const OSSL_ITEM *OSSL_PROVIDER_get_param_types(OSSL_PROVIDER *prov);
-int OSSL_PROVIDER_get_params(OSSL_PROVIDER *prov, const OSSL_PARAM params[]);
+const OSSL_ITEM *OSSL_PROVIDER_get_param_types(const OSSL_PROVIDER *prov);
+int OSSL_PROVIDER_get_params(const OSSL_PROVIDER *prov,
+                             const OSSL_PARAM params[]);

 
 /* Add a built in providers */
 int OSSL_PROVIDER_add_builtin(OPENSSL_CTX *, const char *name,
 
 /* Add a built in providers */
 int OSSL_PROVIDER_add_builtin(OPENSSL_CTX *, const char *name,