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 /include/crypto | |
| 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 'include/crypto')
| -rw-r--r-- | include/crypto/decoder.h | 4 | ||||
| -rw-r--r-- | include/crypto/evp.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/crypto/decoder.h b/include/crypto/decoder.h index d463d1e9b5..a591e43a96 100644 --- a/include/crypto/decoder.h +++ b/include/crypto/decoder.h @@ -23,8 +23,8 @@ OSSL_DECODER *ossl_decoder_fetch_by_number(OSSL_LIB_CTX *libctx, * except read a DER blob and pass it on as a provider object abstraction * (provider-object(7)). */ -void *ossl_decoder_from_dispatch(int id, const OSSL_ALGORITHM *algodef, - OSSL_PROVIDER *prov); +void *ossl_decoder_from_algorithm(int id, const OSSL_ALGORITHM *algodef, + OSSL_PROVIDER *prov); OSSL_DECODER_INSTANCE * ossl_decoder_instance_new(OSSL_DECODER *decoder, void *decoderctx); diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 2089b8b913..fbd0131e78 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -193,6 +193,7 @@ const EVP_PKEY_METHOD *ossl_rsa_pss_pkey_method(void); struct evp_mac_st { OSSL_PROVIDER *prov; int name_id; + const char *description; CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; @@ -214,6 +215,7 @@ struct evp_mac_st { struct evp_kdf_st { OSSL_PROVIDER *prov; int name_id; + const char *description; CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; @@ -251,6 +253,7 @@ struct evp_md_st { /* New structure members */ /* Above comment to be removed when legacy has gone */ int name_id; + const char *description; OSSL_PROVIDER *prov; CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; @@ -303,6 +306,7 @@ struct evp_cipher_st { /* New structure members */ /* Above comment to be removed when legacy has gone */ int name_id; + const char *description; OSSL_PROVIDER *prov; CRYPTO_REF_COUNT refcnt; CRYPTO_RWLOCK *lock; |