summaryrefslogtreecommitdiffstats
path: root/crypto/evp/mac_lib.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-08-16 09:04:29 +0200
committerRichard Levitte <levitte@openssl.org>2019-08-16 09:04:29 +0200
commit92d9d0ae2b10b12e42d33047b60e64ebfc296596 (patch)
tree36268ad8d147f30bb179cb089449beb39271b8d3 /crypto/evp/mac_lib.c
parent356461fbbb8f4070f57ac4d13b34e0e0bbfee92b (diff)
Rename ctx_{get,set}_params to {get,set}_ctx_params
Recently, we added dispatched functions to get parameter descriptions, and those for operation context parameters ended up being called something_gettable_ctx_params and something_settable_ctx_params. The corresponding dispatched functions to actually perform parameter transfers were previously called something_ctx_get_params and something_ctx_set_params, which doesn't quite match, so we rename them to something_get_ctx_params and something_set_ctx_params. An argument in favor of this name change is English, where you'd rather say something like "set the context parameters". This only change the libcrypto <-> provider interface. Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/9612)
Diffstat (limited to 'crypto/evp/mac_lib.c')
-rw-r--r--crypto/evp/mac_lib.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/evp/mac_lib.c b/crypto/evp/mac_lib.c
index 7b07b55e3d..a416687577 100644
--- a/crypto/evp/mac_lib.c
+++ b/crypto/evp/mac_lib.c
@@ -90,8 +90,8 @@ size_t EVP_MAC_size(EVP_MAC_CTX *ctx)
OSSL_PARAM params[2] = { OSSL_PARAM_END, OSSL_PARAM_END };
params[0] = OSSL_PARAM_construct_size_t(OSSL_MAC_PARAM_OUTLEN, &sz);
- if (ctx->meth->ctx_get_params != NULL) {
- if (ctx->meth->ctx_get_params(ctx->data, params))
+ if (ctx->meth->get_ctx_params != NULL) {
+ if (ctx->meth->get_ctx_params(ctx->data, params))
return sz;
} else if (ctx->meth->get_params != NULL) {
if (ctx->meth->get_params(params))
@@ -146,14 +146,14 @@ int EVP_MAC_get_params(EVP_MAC *mac, OSSL_PARAM params[])
int EVP_MAC_CTX_get_params(EVP_MAC_CTX *ctx, OSSL_PARAM params[])
{
- if (ctx->meth->ctx_get_params != NULL)
- return ctx->meth->ctx_get_params(ctx->data, params);
+ if (ctx->meth->get_ctx_params != NULL)
+ return ctx->meth->get_ctx_params(ctx->data, params);
return 1;
}
int EVP_MAC_CTX_set_params(EVP_MAC_CTX *ctx, const OSSL_PARAM params[])
{
- if (ctx->meth->ctx_set_params != NULL)
- return ctx->meth->ctx_set_params(ctx->data, params);
+ if (ctx->meth->set_ctx_params != NULL)
+ return ctx->meth->set_ctx_params(ctx->data, params);
return 1;
}