[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  5c6c4c5c333c8ac469e53521cf747ff527b8813a (commit)
      from  695ecf8b44342d8870b1fc55f423710a7e5e89eb (commit)


- Log -----------------------------------------------------------------
commit 5c6c4c5c333c8ac469e53521cf747ff527b8813a
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Tue Feb 28 16:09:53 2017 -0600

    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 <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2798)

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

Summary of changes:
 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 c4f13a0..0f4ca26 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);
 }