diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-08-21 13:08:18 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-09-03 17:48:31 +0200 |
| commit | bd7a6f16eb52c5c022b2555810efd99006db0a02 (patch) | |
| tree | 84feffce2c891ca206129b37eb8914da674d4666 /crypto/encode_decode/encoder_pkey.c | |
| parent | a9556761418c432844d95e3988b41f19b7c7b56a (diff) | |
OSSL_ENCODER / OSSL_DECODER post-rename cleanup
There are a few remaining spots where 'deser' wasn't changed to 'decoder'
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12587)
Diffstat (limited to 'crypto/encode_decode/encoder_pkey.c')
| -rw-r--r-- | crypto/encode_decode/encoder_pkey.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/encode_decode/encoder_pkey.c b/crypto/encode_decode/encoder_pkey.c index 6664f589b4..176f4fab95 100644 --- a/crypto/encode_decode/encoder_pkey.c +++ b/crypto/encode_decode/encoder_pkey.c @@ -96,7 +96,8 @@ static int encoder_write_cb(const OSSL_PARAM params[], void *arg) OSSL_ENCODER_CTX *ctx = write_data->ctx; BIO *out = write_data->out; - return ctx->encoder->encode_data(ctx->serctx, params, (OSSL_CORE_BIO *)out, + return ctx->encoder->encode_data(ctx->encoderctx, params, + (OSSL_CORE_BIO *)out, ossl_pw_passphrase_callback_enc, &ctx->pwdata); } @@ -135,7 +136,7 @@ static int encoder_EVP_PKEY_to_bio(OSSL_ENCODER_CTX *ctx, BIO *out) &encoder_write_cb, &write_data); } - return ctx->encoder->encode_object(ctx->serctx, keydata, + return ctx->encoder->encode_object(ctx->encoderctx, keydata, (OSSL_CORE_BIO *)out, ossl_pw_passphrase_callback_enc, &ctx->pwdata); @@ -172,8 +173,8 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new_by_EVP_PKEY(const EVP_PKEY *pkey, * Select the encoder in two steps. First, get the names of all of * the encoders. Then determine which is the best one to use. * This has to be broken because it isn't possible to fetch the - * serialisers inside EVP_KEYMGMT_names_do_all() due to locking - * order inversions with the store lock. + * encoders inside EVP_KEYMGMT_names_do_all() due to locking order + * inversions with the store lock. */ sel_data.error = 0; sel_data.names = sk_OPENSSL_CSTRING_new_null(); |