[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a6fd7c1dbef2c3da3c87f1582ae48e4c29aa303c (commit)
      from  57a19206b5aad7ca67f0d5ebae05af2799609819 (commit)


- Log -----------------------------------------------------------------
commit a6fd7c1dbef2c3da3c87f1582ae48e4c29aa303c
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Sun Jan 1 01:43:20 2017 +0100

    fix a memory leak in ssl3_generate_key_block fix the error handling in ssl3_change_cipher_state
    
    Reviewed-by: Kurt Roeckx <kurt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2164)

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

Summary of changes:
 ssl/s3_enc.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index ba71bc1..1651357 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -61,10 +61,10 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
     EVP_MD_CTX_set_flags(m5, EVP_MD_CTX_FLAG_NON_FIPS_ALLOW);
     for (i = 0; (int)i < num; i += MD5_DIGEST_LENGTH) {
         k++;
-        if (k > sizeof buf) {
+        if (k > sizeof(buf)) {
             /* bug: 'buf' is too small for this ciphersuite */
             SSLerr(SSL_F_SSL3_GENERATE_KEY_BLOCK, ERR_R_INTERNAL_ERROR);
-            return 0;
+            goto err;
         }
 
         for (j = 0; j < k; j++)
@@ -227,7 +227,8 @@ int ssl3_change_cipher_state(SSL *s, int which)
 
     memcpy(mac_secret, ms, i);
 
-    EVP_CipherInit_ex(dd, c, NULL, key, iv, (which & SSL3_CC_WRITE));
+    if (!EVP_CipherInit_ex(dd, c, NULL, key, iv, (which & SSL3_CC_WRITE)))
+        goto err2;
 
 #ifdef OPENSSL_SSL_TRACE_CRYPTO
     if (s->msg_callback) {