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_meth.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_meth.c')
| -rw-r--r-- | crypto/encode_decode/encoder_meth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/encode_decode/encoder_meth.c b/crypto/encode_decode/encoder_meth.c index 81bc5c47b9..62342f511a 100644 --- a/crypto/encode_decode/encoder_meth.c +++ b/crypto/encode_decode/encoder_meth.c @@ -475,7 +475,7 @@ OSSL_ENCODER_CTX *OSSL_ENCODER_CTX_new(OSSL_ENCODER *encoder) void *provctx = ossl_provider_ctx(prov); if (OSSL_ENCODER_up_ref(encoder)) { - ctx->serctx = encoder->newctx(provctx); + ctx->encoderctx = encoder->newctx(provctx); } else { OSSL_ENCODER_free(encoder); OPENSSL_free(ctx); @@ -507,7 +507,7 @@ int OSSL_ENCODER_CTX_set_params(OSSL_ENCODER_CTX *ctx, } if (ctx->encoder != NULL && ctx->encoder->set_ctx_params != NULL) - return ctx->encoder->set_ctx_params(ctx->serctx, params); + return ctx->encoder->set_ctx_params(ctx->encoderctx, params); return 0; } @@ -515,7 +515,7 @@ void OSSL_ENCODER_CTX_free(OSSL_ENCODER_CTX *ctx) { if (ctx != NULL) { if (ctx->encoder != NULL && ctx->encoder->freectx != NULL) - ctx->encoder->freectx(ctx->serctx); + ctx->encoder->freectx(ctx->encoderctx); OSSL_ENCODER_free(ctx->encoder); ossl_pw_clear_passphrase_data(&ctx->pwdata); OPENSSL_free(ctx); |