[openssl] master update

[patrick.steuer at de.ibm.com]

The branch master has been updated
       via  6624e1f7b6a397948561e9cc2774f0c8af1d2c79 (commit)
      from  6e4618a0d7e84e70703d546a194df887fd624727 (commit)


- Log -----------------------------------------------------------------
commit 6624e1f7b6a397948561e9cc2774f0c8af1d2c79
Author: Scott Wilson <scott at sawilson.xyz>
Date:   Thu Oct 31 22:37:51 2019 +1100

    Fix potential memory leak in dh_ameth.c
    
    Free dukm in error handling of dh_cms_encrypt()
    
    Fixes #10294
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    (Merged from https://github.com/openssl/openssl/pull/10310)

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

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

diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c
index abb9bfdcbe..7907f50192 100644
--- a/crypto/dh/dh_ameth.c
+++ b/crypto/dh/dh_ameth.c
@@ -976,6 +976,7 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
  err:
     OPENSSL_free(penc);
     X509_ALGOR_free(wrap_alg);
+    OPENSSL_free(dukm);
     return rv;
 }