[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  c6d215e0d278fcd51ad474a3647b61e1b67290bb (commit)
      from  3adc41dd22080c4161d8a2af98d7b29fdbb11915 (commit)


- Log -----------------------------------------------------------------
commit c6d215e0d278fcd51ad474a3647b61e1b67290bb
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Fri Dec 23 14:35:16 2016 +0100

    Fix a memory leak in RSA_padding_add_PKCS1_OAEP_mgf1
    
    Signed-off-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    GH: #2140

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

Summary of changes:
 crypto/rsa/rsa_oaep.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
index c459b91..868104f 100644
--- a/crypto/rsa/rsa_oaep.c
+++ b/crypto/rsa/rsa_oaep.c
@@ -91,17 +91,21 @@ int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
     }
 
     if (PKCS1_MGF1(dbmask, emlen - mdlen, seed, mdlen, mgf1md) < 0)
-        return 0;
+        goto err;
     for (i = 0; i < emlen - mdlen; i++)
         db[i] ^= dbmask[i];
 
     if (PKCS1_MGF1(seedmask, mdlen, db, emlen - mdlen, mgf1md) < 0)
-        return 0;
+        goto err;
     for (i = 0; i < mdlen; i++)
         seed[i] ^= seedmask[i];
 
     OPENSSL_free(dbmask);
     return 1;
+
+ err:
+    OPENSSL_free(dbmask);
+    return 0;
 }
 
 int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,