[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  15d95dd7ea77e68bf9d8450e52230a6017735ec0 (commit)
      from  2f0ca54c32299638e5a1d7577112a7fc07774f00 (commit)


- Log -----------------------------------------------------------------
commit 15d95dd7ea77e68bf9d8450e52230a6017735ec0
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 1 10:48:34 2017 +0100

    Don't use deprecated EVP_CIPHER_CTX_cleanup() internally
    
    Use EVP_CIPHER_CTX_reset() instead
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2812)

-----------------------------------------------------------------------

Summary of changes:
 crypto/cmac/cmac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/cmac/cmac.c b/crypto/cmac/cmac.c
index 0f4ca26..46e3cb7 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);