[openssl-commits] [openssl] OpenSSL_1_1_1-stable update

[Paul I. Dale]

The branch OpenSSL_1_1_1-stable has been updated
       via  030da7436ed0f8feb65d3f0c5fd86f87f5ee2483 (commit)
      from  33a37a6179bcef6917a28edf7c90a65dcd89ff4a (commit)


- Log -----------------------------------------------------------------
commit 030da7436ed0f8feb65d3f0c5fd86f87f5ee2483
Author: Pauli <paul.dale at oracle.com>
Date:   Mon Nov 5 11:04:23 2018 +1000

    Cleanse the key log buffer.
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7564)
    
    (cherry picked from commit e931f370aa38d8645b35fb8d6260cb44d37b6b61)

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

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

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index ec5b155..96b3ed0 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -5117,7 +5117,7 @@ static int nss_keylog_int(const char *prefix,
      * hexadecimal, so we need a buffer that is twice their lengths.
      */
     prefix_len = strlen(prefix);
-    out_len = prefix_len + (2*parameter_1_len) + (2*parameter_2_len) + 3;
+    out_len = prefix_len + (2 * parameter_1_len) + (2 * parameter_2_len) + 3;
     if ((out = cursor = OPENSSL_malloc(out_len)) == NULL) {
         SSLfatal(ssl, SSL_AD_INTERNAL_ERROR, SSL_F_NSS_KEYLOG_INT,
                  ERR_R_MALLOC_FAILURE);
@@ -5141,7 +5141,7 @@ static int nss_keylog_int(const char *prefix,
     *cursor = '\0';
 
     ssl->ctx->keylog_callback(ssl, (const char *)out);
-    OPENSSL_free(out);
+    OPENSSL_clear_free(out, out_len);
     return 1;
 
 }