diff options
Diffstat (limited to 'providers/implementations/kdfs/kbkdf.c')
| -rw-r--r-- | providers/implementations/kdfs/kbkdf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/providers/implementations/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c index 9cf18d8..d25da76 100644 --- a/providers/implementations/kdfs/kbkdf.c +++ b/providers/implementations/kdfs/kbkdf.c @@ -122,7 +122,7 @@ static void kbkdf_reset(void *vctx) KBKDF *ctx = (KBKDF *)vctx; void *provctx = ctx->provctx; - EVP_MAC_free_ctx(ctx->ctx_init); + EVP_MAC_CTX_free(ctx->ctx_init); OPENSSL_clear_free(ctx->context, ctx->context_len); OPENSSL_clear_free(ctx->label, ctx->label_len); OPENSSL_clear_free(ctx->ki, ctx->ki_len); @@ -151,7 +151,7 @@ static int derive(EVP_MAC_CTX *ctx_init, kbkdf_mode mode, unsigned char *iv, for (counter = 1; written < ko_len; counter++) { i = be32(counter); - ctx = EVP_MAC_dup_ctx(ctx_init); + ctx = EVP_MAC_CTX_dup(ctx_init); if (ctx == NULL) goto done; @@ -172,13 +172,13 @@ static int derive(EVP_MAC_CTX *ctx_init, kbkdf_mode mode, unsigned char *iv, written += h; k_i_len = h; - EVP_MAC_free_ctx(ctx); + EVP_MAC_CTX_free(ctx); ctx = NULL; } ret = 1; done: - EVP_MAC_free_ctx(ctx); + EVP_MAC_CTX_free(ctx); return ret; } @@ -247,9 +247,9 @@ static int kbkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) NULL, NULL, libctx)) return 0; else if (ctx->ctx_init != NULL - && !EVP_MAC_is_a(EVP_MAC_get_ctx_mac(ctx->ctx_init), + && !EVP_MAC_is_a(EVP_MAC_CTX_mac(ctx->ctx_init), OSSL_MAC_NAME_HMAC) - && !EVP_MAC_is_a(EVP_MAC_get_ctx_mac(ctx->ctx_init), + && !EVP_MAC_is_a(EVP_MAC_CTX_mac(ctx->ctx_init), OSSL_MAC_NAME_CMAC)) { ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_MAC); return 0; @@ -288,7 +288,7 @@ static int kbkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) ctx->ki, ctx->ki_len); mparams[1] = OSSL_PARAM_construct_end(); - if (!EVP_MAC_set_ctx_params(ctx->ctx_init, mparams) + if (!EVP_MAC_CTX_set_params(ctx->ctx_init, mparams) || !EVP_MAC_init(ctx->ctx_init)) return 0; } |