mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

make struct provider_info_st a full type

Browse Source 
Create the OSSL_PROVIDER_INFO to replace struct provider_info_st.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15854)
This commit is contained in:
Matt Caswell 2021-06-21 15:59:41 +01:00
parent 549b5cb4ed
commit b7248964a4
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/provider_conf.c
View File

@ -62,7 +62,7 @@ static const char *skip_dot(const char *name)
}
static int provider_conf_params(OSSL_PROVIDER *prov,
struct provider_info_st *provinfo,
OSSL_PROVIDER_INFO *provinfo,
const char *name, const char *value,
const CONF *cnf)
{
@ -187,7 +187,7 @@ static int provider_conf_load(OSSL_LIB_CTX *libctx, const char *name,
if (!ok)
ossl_provider_free(prov);
} else {
struct provider_info_st entry;
OSSL_PROVIDER_INFO entry;
memset(&entry, 0, sizeof(entry));
ok = 1;

18
crypto/provider_core.c
View File

@ -131,7 +131,7 @@ struct provider_store_st {
CRYPTO_RWLOCK *default_path_lock;
CRYPTO_RWLOCK *lock;
char *default_path;
struct provider_info_st *provinfo;
OSSL_PROVIDER_INFO *provinfo;
size_t numprovinfo;
size_t provinfosz;
unsigned int use_fallbacks:1;
@ -188,7 +188,7 @@ static INFOPAIR *infopair_copy(const INFOPAIR *src)
return NULL;
}
void ossl_provider_info_clear(struct provider_info_st *info)
void ossl_provider_info_clear(OSSL_PROVIDER_INFO *info)
{
OPENSSL_free(info->name);
OPENSSL_free(info->path);
@ -272,7 +272,7 @@ int ossl_provider_disable_fallback_loading(OSSL_LIB_CTX *libctx)
#define BUILTINS_BLOCK_SIZE 10
int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
const struct provider_info_st *entry)
OSSL_PROVIDER_INFO *entry)
{
struct provider_store_st *store = get_provider_store(libctx);
int ret = 0;
@ -298,7 +298,7 @@ int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
}
store->provinfosz = BUILTINS_BLOCK_SIZE;
} else if (store->numprovinfo == store->provinfosz) {
struct provider_info_st *tmpbuiltins;
OSSL_PROVIDER_INFO *tmpbuiltins;
size_t newsz = store->provinfosz + BUILTINS_BLOCK_SIZE;
tmpbuiltins = OPENSSL_realloc(store->provinfo,
@ -322,7 +322,7 @@ int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
int OSSL_PROVIDER_add_builtin(OSSL_LIB_CTX *libctx, const char *name,
OSSL_provider_init_fn *init_fn)
{
struct provider_info_st entry;
OSSL_PROVIDER_INFO entry;
if (name == NULL || init_fn == NULL) {
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
@ -451,7 +451,7 @@ OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name,
int noconfig)
{
struct provider_store_st *store = NULL;
struct provider_info_st template;
OSSL_PROVIDER_INFO template;
OSSL_PROVIDER *prov = NULL;
if ((store = get_provider_store(libctx)) == NULL)
@ -467,7 +467,7 @@ OSSL_PROVIDER *ossl_provider_new(OSSL_LIB_CTX *libctx, const char *name,
memset(&template, 0, sizeof(template));
if (init_function == NULL) {
const struct provider_info_st *p;
const OSSL_PROVIDER_INFO *p;
size_t i;
/* Check if this is a predefined builtin provider */
@ -664,7 +664,7 @@ int ossl_provider_add_parameter(OSSL_PROVIDER *prov,
return infopair_add(&prov->parameters, name, value);
}
int ossl_provider_info_add_parameter(struct provider_info_st *provinfo,
int ossl_provider_info_add_parameter(OSSL_PROVIDER_INFO *provinfo,
const char *name,
const char *value)
{
@ -1075,7 +1075,7 @@ static int provider_activate_fallbacks(struct provider_store_st *store)
int use_fallbacks;
int activated_fallback_count = 0;
int ret = 0;
const struct provider_info_st *p;
const OSSL_PROVIDER_INFO *p;
if (!CRYPTO_THREAD_read_lock(store->lock))
return 0;

12
crypto/provider_local.h
View File

@ -15,19 +15,19 @@ typedef struct {
} INFOPAIR;
DEFINE_STACK_OF(INFOPAIR)
struct provider_info_st {
typedef struct {
char *name;
char *path;
OSSL_provider_init_fn *init;
STACK_OF(INFOPAIR) *parameters;
unsigned int is_fallback:1;
};
} OSSL_PROVIDER_INFO;
extern const struct provider_info_st ossl_predefined_providers[];
extern const OSSL_PROVIDER_INFO ossl_predefined_providers[];
void ossl_provider_info_clear(struct provider_info_st *info);
void ossl_provider_info_clear(OSSL_PROVIDER_INFO *info);
int ossl_provider_info_add_to_store(OSSL_LIB_CTX *libctx,
const struct provider_info_st *entry);
int ossl_provider_info_add_parameter(struct provider_info_st *provinfo,
OSSL_PROVIDER_INFO *entry);
int ossl_provider_info_add_parameter(OSSL_PROVIDER_INFO *provinfo,
const char *name,
const char *value);

2
crypto/provider_predefined.c
View File

@ -17,7 +17,7 @@ OSSL_provider_init_fn ossl_fips_intern_provider_init;
#ifdef STATIC_LEGACY
OSSL_provider_init_fn ossl_legacy_provider_init;
#endif
const struct provider_info_st ossl_predefined_providers[] = {
const OSSL_PROVIDER_INFO ossl_predefined_providers[] = {
#ifdef FIPS_MODULE
{ "fips", NULL, ossl_fips_intern_provider_init, NULL, 1 },
#else