diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-05-14 13:08:42 +1000 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-05-24 10:12:18 +1000 |
| commit | 7c14d0c1c0ece97f7406b4df466df6439146d6c6 (patch) | |
| tree | 0df7120b66ec8b6cc4072492822fa071fd1288ef /crypto/evp/mac_meth.c | |
| parent | c45df3302d20291ff1125f1aeb82fae1cdceaac8 (diff) | |
| download | openssl-7c14d0c1c0ece97f7406b4df466df6439146d6c6.zip openssl-7c14d0c1c0ece97f7406b4df466df6439146d6c6.tar.gz openssl-7c14d0c1c0ece97f7406b4df466df6439146d6c6.tar.bz2 | |
Rename the field 'provctx and data' to 'algctx' inside some objects containing
pointers to provider size algorithm contexts.
Fixes #14284
The gettable_ctx_params methods were confusingly passing a 'provctx' and
a provider context which are completely different objects.
Some objects such as EVP_KDF used 'data' while others such as EVP_MD used 'provctx'.
For libcrypto this 'ctx' is an opaque ptr returned when a providers algorithm
implementation creates an internal context using a new_ctx() method.
Hence the new name 'algctx'.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15275)
Diffstat (limited to 'crypto/evp/mac_meth.c')
| -rw-r--r-- | crypto/evp/mac_meth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c index 342aadc..6396eb3 100644 --- a/crypto/evp/mac_meth.c +++ b/crypto/evp/mac_meth.c @@ -214,7 +214,7 @@ const OSSL_PARAM *EVP_MAC_CTX_gettable_params(EVP_MAC_CTX *ctx) if (ctx->meth->gettable_ctx_params == NULL) return NULL; alg = ossl_provider_ctx(EVP_MAC_provider(ctx->meth)); - return ctx->meth->gettable_ctx_params(ctx->data, alg); + return ctx->meth->gettable_ctx_params(ctx->algctx, alg); } const OSSL_PARAM *EVP_MAC_CTX_settable_params(EVP_MAC_CTX *ctx) @@ -224,7 +224,7 @@ const OSSL_PARAM *EVP_MAC_CTX_settable_params(EVP_MAC_CTX *ctx) if (ctx->meth->settable_ctx_params == NULL) return NULL; alg = ossl_provider_ctx(EVP_MAC_provider(ctx->meth)); - return ctx->meth->settable_ctx_params(ctx->data, alg); + return ctx->meth->settable_ctx_params(ctx->algctx, alg); } void EVP_MAC_do_all_provided(OSSL_LIB_CTX *libctx, |