From b6c1e331ce6c3b43b0d0f8acd2dfc10b8da3f51c Mon Sep 17 00:00:00 2001 From: tb Date: Sun, 28 Jan 2024 20:57:15 +0000 Subject: [PATCH] Avoid calling EVP_CIPHER_CTX_reset() on a NULL ctx --- lib/libcrypto/cmac/cmac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libcrypto/cmac/cmac.c b/lib/libcrypto/cmac/cmac.c index 29f5048897f..42f630c1499 100644 --- a/lib/libcrypto/cmac/cmac.c +++ b/lib/libcrypto/cmac/cmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmac.c,v 1.19 2024/01/28 14:55:40 joshua Exp $ */ +/* $OpenBSD: cmac.c,v 1.20 2024/01/28 20:57:15 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ @@ -131,7 +131,8 @@ LCRYPTO_ALIAS(CMAC_CTX_new); void CMAC_CTX_cleanup(CMAC_CTX *ctx) { - EVP_CIPHER_CTX_reset(ctx->cipher_ctx); + if (ctx->cipher_ctx != NULL) + EVP_CIPHER_CTX_reset(ctx->cipher_ctx); explicit_bzero(ctx->tbl, EVP_MAX_BLOCK_LENGTH); explicit_bzero(ctx->k1, EVP_MAX_BLOCK_LENGTH); explicit_bzero(ctx->k2, EVP_MAX_BLOCK_LENGTH); -- 2.20.1