[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  a44a208442ecf8f576c9e364f8b46b6661c7d2de (commit)
      from  6b2ebe4332e22b4eb7dd6fadf418e3da7b926ca4 (commit)


- Log -----------------------------------------------------------------
commit a44a208442ecf8f576c9e364f8b46b6661c7d2de
Author: J Mohan Rao Arisankala <mohan at barracuda.com>
Date:   Tue Feb 23 20:20:50 2016 +0530

    GH735: remove unnecessary allocation
    
    Removing code, where memory was getting allocated for an unused variable
    
    Signed-off-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 ssl/t1_enc.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c
index 6b3a73e..1b2820b 100644
--- a/ssl/t1_enc.c
+++ b/ssl/t1_enc.c
@@ -648,15 +648,10 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
                                 const unsigned char *context,
                                 size_t contextlen, int use_context)
 {
-    unsigned char *buff;
     unsigned char *val = NULL;
     size_t vallen = 0, currentvalpos;
     int rv;
 
-    buff = OPENSSL_malloc(olen);
-    if (buff == NULL)
-        goto err2;
-
     /*
      * construct PRF arguments we construct the PRF argument ourself rather
      * than passing separate values into the TLS PRF to ensure that the
@@ -729,7 +724,6 @@ int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen,
     rv = 0;
  ret:
     OPENSSL_clear_free(val, vallen);
-    OPENSSL_clear_free(buff, olen);
     return (rv);
 }