From 0adaabf6cd9ef104468edd353d721cd2d7afca5e Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Tue, 28 Feb 2017 16:09:53 -0600 Subject: [PATCH] Don't free in cleanup routine Cleanse instead, and free in the free routine. Seems to have been introduced in commit 846ec07d904f9cc81d486db0db14fb84f61ff6e5 when EVP_CIPHER_CTX was made opaque. Reviewed-by: Richard Levitte Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2798) (cherry picked from commit 5c6c4c5c333c8ac469e53521cf747ff527b8813a) --- crypto/cmac/cmac.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c index c4f13a069f..0f4ca26bc2 100644 --- a/crypto/cmac/cmac.c +++ b/crypto/cmac/cmac.c @@ -60,7 +60,7 @@ CMAC_CTX *CMAC_CTX_new(void) void CMAC_CTX_cleanup(CMAC_CTX *ctx) { - EVP_CIPHER_CTX_free(ctx->cctx); + EVP_CIPHER_CTX_cleanup(ctx->cctx); OPENSSL_cleanse(ctx->tbl, EVP_MAX_BLOCK_LENGTH); OPENSSL_cleanse(ctx->k1, EVP_MAX_BLOCK_LENGTH); OPENSSL_cleanse(ctx->k2, EVP_MAX_BLOCK_LENGTH); @@ -78,6 +78,7 @@ void CMAC_CTX_free(CMAC_CTX *ctx) if (!ctx) return; CMAC_CTX_cleanup(ctx); + EVP_CIPHER_CTX_free(ctx->cctx); OPENSSL_free(ctx); } -- 2.25.1