diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-02-11 16:57:37 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-02-17 15:26:12 +0100 |
| commit | fe75766c9c2919f649df7b3ad209df2bc5e56dd0 (patch) | |
| tree | e7be8f417b0102fffe05865c41a4fbf384993587 /include | |
| parent | e5ac413b2d3d6bcff57446f06f3d05650921f182 (diff) | |
Rename OSSL_ENCODER_CTX_new_by_EVP_PKEY and OSSL_DECODER_CTX_new_by_EVP_PKEY
Additional renames done in encoder and decoder implementation
to follow the style.
Fixes #13622
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14155)
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/decoder.h | 8 | ||||
| -rw-r--r-- | include/openssl/decoder.h | 10 | ||||
| -rw-r--r-- | include/openssl/encoder.h | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/include/crypto/decoder.h b/include/crypto/decoder.h index 5d055fecd8..a83615a8e6 100644 --- a/include/crypto/decoder.h +++ b/include/crypto/decoder.h @@ -32,10 +32,10 @@ void ossl_decoder_instance_free(OSSL_DECODER_INSTANCE *decoder_inst); int ossl_decoder_ctx_add_decoder_inst(OSSL_DECODER_CTX *ctx, OSSL_DECODER_INSTANCE *di); -int ossl_decoder_ctx_setup_for_EVP_PKEY(OSSL_DECODER_CTX *ctx, - EVP_PKEY **pkey, const char *keytype, - OSSL_LIB_CTX *libctx, - const char *propquery); +int ossl_decoder_ctx_setup_for_pkey(OSSL_DECODER_CTX *ctx, + EVP_PKEY **pkey, const char *keytype, + OSSL_LIB_CTX *libctx, + const char *propquery); #endif diff --git a/include/openssl/decoder.h b/include/openssl/decoder.h index 3c3a9a1ea2..29ccb0a7ff 100644 --- a/include/openssl/decoder.h +++ b/include/openssl/decoder.h @@ -120,11 +120,11 @@ int OSSL_DECODER_from_data(OSSL_DECODER_CTX *ctx, const unsigned char **pdata, * an implicit OSSL_DECODER_fetch(), suitable for the object of that type. */ OSSL_DECODER_CTX * -OSSL_DECODER_CTX_new_by_EVP_PKEY(EVP_PKEY **pkey, - const char *input_type, - const char *input_struct, - const char *keytype, int selection, - OSSL_LIB_CTX *libctx, const char *propquery); +OSSL_DECODER_CTX_new_for_pkey(EVP_PKEY **pkey, + const char *input_type, + const char *input_struct, + const char *keytype, int selection, + OSSL_LIB_CTX *libctx, const char *propquery); # ifdef __cplusplus } diff --git a/include/openssl/encoder.h b/include/openssl/encoder.h index 122a46bac9..c6a300bd9c 100644 --- a/include/openssl/encoder.h +++ b/include/openssl/encoder.h @@ -113,11 +113,11 @@ int OSSL_ENCODER_to_data(OSSL_ENCODER_CTX *ctx, unsigned char **pdata, * an implicit OSSL_ENCODER_fetch(), suitable for the object of that type. * This is more useful than calling OSSL_ENCODER_CTX_new(). */ -OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_by_EVP_PKEY(const EVP_PKEY *pkey, - int selection, - const char *output_type, - const char *output_struct, - const char *propquery); +OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_for_pkey(const EVP_PKEY *pkey, + int selection, + const char *output_type, + const char *output_struct, + const char *propquery); # ifdef __cplusplus } |