mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +08:00
5a29b6286f
When a desired algorithm wasn't available, we didn't register anywhere that an attempt had been made, with the result that next time the same attempt was made, the whole process would be done again. To avoid this churn, we register a bit for each operation that has been queried in the libcrypto provider object, and test it before trying the same query and method construction loop again. If course, if the provider has told us not to cache, we don't register this bit. Fixes #11814 Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/11842)
137 lines
4.3 KiB
C
137 lines
4.3 KiB
C
/*
|
|
* Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <openssl/core.h>
|
|
#include "internal/cryptlib.h"
|
|
#include "internal/core.h"
|
|
#include "internal/property.h"
|
|
#include "internal/provider.h"
|
|
|
|
struct construct_data_st {
|
|
OPENSSL_CTX *libctx;
|
|
OSSL_METHOD_STORE *store;
|
|
int operation_id;
|
|
int force_store;
|
|
OSSL_METHOD_CONSTRUCT_METHOD *mcm;
|
|
void *mcm_data;
|
|
};
|
|
|
|
static int ossl_method_construct_precondition(OSSL_PROVIDER *provider,
|
|
int operation_id, void *cbdata,
|
|
int *result)
|
|
{
|
|
if (!ossl_assert(result != NULL)) {
|
|
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
|
|
return 0;
|
|
}
|
|
|
|
if (!ossl_provider_test_operation_bit(provider, operation_id, result))
|
|
return 0;
|
|
|
|
/*
|
|
* The result we get tells if methods have already been constructed.
|
|
* However, we want to tell whether construction should happen (true)
|
|
* or not (false), which is the opposite of what we got.
|
|
*/
|
|
*result = !*result;
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int ossl_method_construct_postcondition(OSSL_PROVIDER *provider,
|
|
int operation_id, int no_store,
|
|
void *cbdata, int *result)
|
|
{
|
|
if (!ossl_assert(result != NULL)) {
|
|
ERR_raise(ERR_LIB_CRYPTO, ERR_R_PASSED_NULL_PARAMETER);
|
|
return 0;
|
|
}
|
|
|
|
*result = 1;
|
|
return no_store != 0
|
|
|| ossl_provider_set_operation_bit(provider, operation_id);
|
|
}
|
|
|
|
static void ossl_method_construct_this(OSSL_PROVIDER *provider,
|
|
const OSSL_ALGORITHM *algo,
|
|
int no_store, void *cbdata)
|
|
{
|
|
struct construct_data_st *data = cbdata;
|
|
void *method = NULL;
|
|
|
|
if ((method = data->mcm->construct(algo, provider, data->mcm_data))
|
|
== NULL)
|
|
return;
|
|
|
|
/*
|
|
* Note regarding putting the method in stores:
|
|
*
|
|
* we don't need to care if it actually got in or not here.
|
|
* If it didn't get in, it will simply not be available when
|
|
* ossl_method_construct() tries to get it from the store.
|
|
*
|
|
* It is *expected* that the put function increments the refcnt
|
|
* of the passed method.
|
|
*/
|
|
|
|
if (data->force_store || !no_store) {
|
|
/*
|
|
* If we haven't been told not to store,
|
|
* add to the global store
|
|
*/
|
|
data->mcm->put(data->libctx, NULL, method, provider,
|
|
data->operation_id, algo->algorithm_names,
|
|
algo->property_definition, data->mcm_data);
|
|
}
|
|
|
|
data->mcm->put(data->libctx, data->store, method, provider,
|
|
data->operation_id, algo->algorithm_names,
|
|
algo->property_definition, data->mcm_data);
|
|
|
|
/* refcnt-- because we're dropping the reference */
|
|
data->mcm->destruct(method, data->mcm_data);
|
|
}
|
|
|
|
void *ossl_method_construct(OPENSSL_CTX *libctx, int operation_id,
|
|
int force_store,
|
|
OSSL_METHOD_CONSTRUCT_METHOD *mcm, void *mcm_data)
|
|
{
|
|
void *method = NULL;
|
|
|
|
if ((method = mcm->get(libctx, NULL, 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(libctx)) == NULL)
|
|
goto fin;
|
|
|
|
cbdata.libctx = libctx;
|
|
cbdata.operation_id = operation_id;
|
|
cbdata.force_store = force_store;
|
|
cbdata.mcm = mcm;
|
|
cbdata.mcm_data = mcm_data;
|
|
ossl_algorithm_do_all(libctx, operation_id, NULL,
|
|
ossl_method_construct_precondition,
|
|
ossl_method_construct_this,
|
|
ossl_method_construct_postcondition,
|
|
&cbdata);
|
|
|
|
method = mcm->get(libctx, cbdata.store, mcm_data);
|
|
mcm->dealloc_tmp_store(cbdata.store);
|
|
}
|
|
|
|
fin:
|
|
return method;
|
|
}
|