From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 3 Apr 2019 19:13:22 +0000 (+0100)
Subject: OpenSSL: tidy coding of session keys debug
X-Git-Tag: exim-4.93-RC0~244
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/10ed27e00c45ff6bf5494f74758541d61dd15880?ds=sidebyside

OpenSSL: tidy coding of session keys debug
---

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 5a5e1464b..8671e1129 100644
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -2345,12 +2345,8 @@ DEBUG(D_tls)
 
 #ifdef EXIM_HAVE_OPENSSL_KEYLOG
   {
-  BIO * bp = BIO_new(BIO_s_mem());
-  uschar * s;
-  int len;
+  BIO * bp = BIO_new_fp(debug_file, BIO_NOCLOSE);
   SSL_SESSION_print_keylog(bp, SSL_get_session(server_ssl));
-  len = (int) BIO_get_mem_data(bp, CSS &s);
-  debug_printf("%.*s", len, s);
   BIO_free(bp);
   }
 #endif
@@ -2724,18 +2720,9 @@ DEBUG(D_tls)
   debug_printf("SSL_connect succeeded\n");
 #ifdef EXIM_HAVE_OPENSSL_KEYLOG
   {
-  BIO * bp = BIO_new(BIO_s_mem());
-  if (bp)
-    {
-    uschar * s;
-    int len;
-    SSL_SESSION_print_keylog(bp, SSL_get_session(exim_client_ctx->ssl));
-    len = (int) BIO_get_mem_data(bp, CSS &s);
-    debug_printf("%.*s", len, s);
-    BIO_free(bp);
-    }
-  else
-    debug_printf("(alloc failure for keylog)\n");
+  BIO * bp = BIO_new_fp(debug_file, BIO_NOCLOSE);
+  SSL_SESSION_print_keylog(bp, SSL_get_session(exim_client_ctx->ssl));
+  BIO_free(bp);
   }
 #endif
   }