From: Richard Levitte <levitte@openssl.org>
Date: Wed, 1 Mar 2017 09:48:34 +0000 (+0100)
Subject: Don't use deprecated EVP_CIPHER_CTX_cleanup() internally
X-Git-Tag: OpenSSL_1_1_1-pre1~2199
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=15d95dd7ea77e68bf9d8450e52230a6017735ec0;p=oweals%2Fopenssl.git

Don't use deprecated EVP_CIPHER_CTX_cleanup() internally

Use EVP_CIPHER_CTX_reset() instead

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2812)
---

diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c
index 0f4ca26bc2..46e3cb7912 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_cleanup(ctx->cctx);
+    EVP_CIPHER_CTX_reset(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);