Latest update.
This commit is contained in:
+10
-9
@@ -56,14 +56,14 @@ static int ossl_method_construct_this(OSSL_PROVIDER *provider, void *cbdata)
|
||||
* If we haven't been told not to store,
|
||||
* add to the global store
|
||||
*/
|
||||
data->mcm->put(data->libctx, NULL,
|
||||
thismap->property_definition,
|
||||
method, data->mcm_data);
|
||||
data->mcm->put(data->libctx, NULL, method,
|
||||
thismap->algorithm_name,
|
||||
thismap->property_definition, data->mcm_data);
|
||||
}
|
||||
|
||||
data->mcm->put(data->libctx, data->store,
|
||||
thismap->property_definition,
|
||||
method, data->mcm_data);
|
||||
data->mcm->put(data->libctx, data->store, method,
|
||||
thismap->algorithm_name, thismap->property_definition,
|
||||
data->mcm_data);
|
||||
|
||||
/* refcnt-- because we're dropping the reference */
|
||||
data->mcm->destruct(method, data->mcm_data);
|
||||
@@ -79,14 +79,15 @@ void *ossl_method_construct(OPENSSL_CTX *libctx, int operation_id,
|
||||
{
|
||||
void *method = NULL;
|
||||
|
||||
if ((method = mcm->get(libctx, NULL, propquery, mcm_data)) == NULL) {
|
||||
if ((method =
|
||||
mcm->get(libctx, NULL, name, propquery, mcm_data)) == NULL) {
|
||||
struct construct_data_st cbdata;
|
||||
|
||||
/*
|
||||
* We have a temporary store to be able to easily search among new
|
||||
* items, or items that should find themselves in the global store.
|
||||
*/
|
||||
if ((cbdata.store = mcm->alloc_tmp_store()) == NULL)
|
||||
if ((cbdata.store = mcm->alloc_tmp_store(libctx)) == NULL)
|
||||
goto fin;
|
||||
|
||||
cbdata.libctx = libctx;
|
||||
@@ -97,7 +98,7 @@ void *ossl_method_construct(OPENSSL_CTX *libctx, int operation_id,
|
||||
ossl_provider_forall_loaded(libctx, ossl_method_construct_this,
|
||||
&cbdata);
|
||||
|
||||
method = mcm->get(libctx, cbdata.store, propquery, mcm_data);
|
||||
method = mcm->get(libctx, cbdata.store, name, propquery, mcm_data);
|
||||
mcm->dealloc_tmp_store(cbdata.store);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user