Commit 24626a47 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarTomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9054)
parent 3c9a8d4a

crypto/provider.c

+3 −2
Original line number Diff line number Diff line
@@ -35,12 +35,13 @@ int OSSL_PROVIDER_unload(OSSL_PROVIDER *prov) 
    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);

}



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);

}

crypto/provider_core.c

+4 −4
Original line number Diff line number Diff line
@@ -575,17 +575,17 @@ int ossl_provider_set_fallback(OSSL_PROVIDER *prov) 
}



/* 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;

}



const DSO *ossl_provider_dso(OSSL_PROVIDER *prov)

const DSO *ossl_provider_dso(const OSSL_PROVIDER *prov)

{

    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;
@@ -594,7 +594,7 @@ const char *ossl_provider_module_name(OSSL_PROVIDER *prov) 
#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;

include/internal/provider.h

+4 −4
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ int ossl_provider_forall_loaded(OPENSSL_CTX *, 
                                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);

include/openssl/provider.h

+3 −2
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ extern "C" { 
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,