diff options
| author | Pauli <paul.dale@oracle.com> | 2018-11-05 11:04:23 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2018-11-06 07:08:30 +1000 |
| commit | 030da7436ed0f8feb65d3f0c5fd86f87f5ee2483 (patch) | |
| tree | acf4499d74fef54d5bedabc174a6b8e31f3a41ac /ssl/ssl_lib.c | |
| parent | 33a37a6179bcef6917a28edf7c90a65dcd89ff4a (diff) | |
Cleanse the key log buffer.
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/7564)
(cherry picked from commit e931f370aa38d8645b35fb8d6260cb44d37b6b61)
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index ec5b1554f7..96b3ed0860 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; } |