diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-04-14 12:42:30 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-04-15 17:38:19 +0200 |
| commit | ddf0d149e2fd0d894eec08f7237f5a686fc85575 (patch) | |
| tree | 5062de02165312436ba565a46195799a0e0648e7 /crypto | |
| parent | changes: note that some ctrl calls have a different error return. (diff) | |
| download | openssl-ddf0d149e2fd0d894eec08f7237f5a686fc85575.tar.xz openssl-ddf0d149e2fd0d894eec08f7237f5a686fc85575.zip | |
Rename EVP_PKEY_get0_first_alg_name to EVP_PKEY_get0_type_name
We use type elsewhere and documenting the 'first' in the
name of the call is a little bit superfluous making the
name too mouthful.
Also rename EVP_PKEY_typenames_do_all to
EVP_PKEY_type_names_do_all to keep the words separated by
underscore.
Fixes #14701
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14868)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/encode_decode/encoder_pkey.c | 2 | ||||
| -rw-r--r-- | crypto/evp/evp_pkey.c | 2 | ||||
| -rw-r--r-- | crypto/evp/p_lib.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crypto/encode_decode/encoder_pkey.c b/crypto/encode_decode/encoder_pkey.c index 0c2207f54d..4bfd219fe2 100644 --- a/crypto/encode_decode/encoder_pkey.c +++ b/crypto/encode_decode/encoder_pkey.c @@ -316,7 +316,7 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey, OSSL_TRACE_BEGIN(ENCODER) { BIO_printf(trc_out, "(ctx %p) Looking for %s encoders with selection %d\n", - (void *)ctx, EVP_PKEY_get0_first_alg_name(pkey), selection); + (void *)ctx, EVP_PKEY_get0_type_name(pkey), selection); BIO_printf(trc_out, " output type: %s, output structure: %s\n", output_type, output_struct); } OSSL_TRACE_END(ENCODER); diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c index 35de85cffd..a31c54887b 100644 --- a/crypto/evp/evp_pkey.c +++ b/crypto/evp/evp_pkey.c @@ -219,7 +219,7 @@ int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, return 0; } -const char *EVP_PKEY_get0_first_alg_name(const EVP_PKEY *key) +const char *EVP_PKEY_get0_type_name(const EVP_PKEY *key) { const EVP_PKEY_ASN1_METHOD *ameth; const char *name = NULL; diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index de4f1811c1..407ef22154 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -973,9 +973,9 @@ int EVP_PKEY_is_a(const EVP_PKEY *pkey, const char *name) return EVP_KEYMGMT_is_a(pkey->keymgmt, name); } -int EVP_PKEY_typenames_do_all(const EVP_PKEY *pkey, - void (*fn)(const char *name, void *data), - void *data) +int EVP_PKEY_type_names_do_all(const EVP_PKEY *pkey, + void (*fn)(const char *name, void *data), + void *data) { if (!evp_pkey_is_typed(pkey)) return 0; |