[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  e43a13c807e42688c72c4f3d001112bf0a110464 (commit)
      from  68886be7e2cd395a759fcd41d2cede461b68843d (commit)


- Log -----------------------------------------------------------------
commit e43a13c807e42688c72c4f3d001112bf0a110464
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Jun 8 09:29:56 2015 +0100

    Fix leak in HMAC error path
    
    In the event of an error in the HMAC function, leaks can occur because the
    HMAC_CTX does not get cleaned up.
    
    Thanks to the BoringSSL project for reporting this issue.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/hmac/hmac.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
index 572393e..d50fabb 100644
--- a/crypto/hmac/hmac.c
+++ b/crypto/hmac/hmac.c
@@ -219,6 +219,7 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
     HMAC_CTX_cleanup(&c);
     return md;
  err:
+    HMAC_CTX_cleanup(&c);
     return NULL;
 }