diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-03-16 14:14:43 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-04-02 08:52:37 +0200 |
| commit | 309a78aa305ee14878e453c78ccf9a7dc91264cf (patch) | |
| tree | 82b3791b395f3e6557084d08cdf3058a30eb38e2 /providers | |
| parent | 650c66873793bed505802f316b15772a0f887743 (diff) | |
CORE: Add an algorithm_description field to OSSL_ALGORITHM
This corresponds to the |info| field in EVP_PKEY_ASN1_METHOD, as well
as the generic use of OBJ_nid2ln() as a one line description.
We also add the base functionality to make use of this field.
Fixes #14514
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14656)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/implementations/storemgmt/file_store.c | 4 | ||||
| -rw-r--r-- | providers/implementations/storemgmt/file_store_der2obj.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c index e121052545..37f2fcee67 100644 --- a/providers/implementations/storemgmt/file_store.c +++ b/providers/implementations/storemgmt/file_store.c @@ -437,8 +437,8 @@ static int file_setup_decoders(struct file_ctx_st *ctx) * The decoder doesn't need any identification or to be attached to * any provider, since it's only used locally. */ - to_obj = ossl_decoder_from_dispatch(0, &ossl_der_to_obj_algorithm, - NULL); + to_obj = ossl_decoder_from_algorithm(0, &ossl_der_to_obj_algorithm, + NULL); if (to_obj == NULL) goto err; to_obj_inst = ossl_decoder_instance_new(to_obj, ctx->provctx); diff --git a/providers/implementations/storemgmt/file_store_der2obj.c b/providers/implementations/storemgmt/file_store_der2obj.c index a36e9ab003..94bc467e3e 100644 --- a/providers/implementations/storemgmt/file_store_der2obj.c +++ b/providers/implementations/storemgmt/file_store_der2obj.c @@ -36,7 +36,7 @@ /* * newctx and freectx are not strictly necessary. However, the method creator, - * ossl_decoder_from_dispatch(), demands that they exist, so we make sure to + * ossl_decoder_from_algorithm(), demands that they exist, so we make sure to * oblige. */ |