From 90a2576b9bbb327141df0bd244830b462fcaeee6 Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Tue, 13 Oct 2020 14:22:17 +1000 Subject: Rename EVP_MAC_size() to EVP_MAC_CTX_get_mac_size(). Fixes #11320 Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/13116) --- providers/implementations/kdfs/kbkdf.c | 2 +- providers/implementations/kdfs/sskdf.c | 2 +- providers/implementations/kdfs/tls1_prf.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'providers') diff --git a/providers/implementations/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c index cf3b90c19c..74a694e8ea 100644 --- a/providers/implementations/kdfs/kbkdf.c +++ b/providers/implementations/kdfs/kbkdf.c @@ -218,7 +218,7 @@ static int kbkdf_derive(void *vctx, unsigned char *key, size_t keylen) return 0; } - h = EVP_MAC_size(ctx->ctx_init); + h = EVP_MAC_CTX_get_mac_size(ctx->ctx_init); if (h == 0) goto done; if (ctx->iv_len != 0 && ctx->iv_len != h) { diff --git a/providers/implementations/kdfs/sskdf.c b/providers/implementations/kdfs/sskdf.c index 6cfde97842..84711dde27 100644 --- a/providers/implementations/kdfs/sskdf.c +++ b/providers/implementations/kdfs/sskdf.c @@ -246,7 +246,7 @@ static int SSKDF_mac_kdm(EVP_MAC_CTX *ctx_init, if (!EVP_MAC_init(ctx_init)) goto end; - out_len = EVP_MAC_size(ctx_init); /* output size */ + out_len = EVP_MAC_CTX_get_mac_size(ctx_init); /* output size */ if (out_len <= 0) goto end; len = derived_key_len; diff --git a/providers/implementations/kdfs/tls1_prf.c b/providers/implementations/kdfs/tls1_prf.c index 315971a96e..aba08068ca 100644 --- a/providers/implementations/kdfs/tls1_prf.c +++ b/providers/implementations/kdfs/tls1_prf.c @@ -296,7 +296,7 @@ static int tls1_prf_P_hash(EVP_MAC_CTX *ctx_init, goto err; if (!EVP_MAC_init(ctx_init)) goto err; - chunk = EVP_MAC_size(ctx_init); + chunk = EVP_MAC_CTX_get_mac_size(ctx_init); if (chunk == 0) goto err; /* A(0) = seed */ -- cgit v1.2.1