From: Matt Caswell <matt@openssl.org>
Date: Wed, 5 Jul 2017 09:32:33 +0000 (+0100)
Subject: Fix memory leak when using PSK session files
X-Git-Tag: OpenSSL_1_1_1-pre1~1088
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9561e2a169f499f8346ffdd7541bc4e3d81d6711;p=oweals%2Fopenssl.git

Fix memory leak when using PSK session files

We were not freeing the session created when loading a PSK session file.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/3855)
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 56209ac0f6..5525b31769 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -3009,6 +3009,7 @@ int s_client_main(int argc, char **argv)
             print_stuff(bio_c_out, con, 1);
         SSL_free(con);
     }
+    SSL_SESSION_free(psksess);
 #if !defined(OPENSSL_NO_NEXTPROTONEG)
     OPENSSL_free(next_proto.data);
 #endif
diff --git a/apps/s_server.c b/apps/s_server.c
index 13cc7a190a..8df767c992 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2104,6 +2104,7 @@ int s_server_main(int argc, char *argv[])
     ret = 0;
  end:
     SSL_CTX_free(ctx);
+    SSL_SESSION_free(psksess);
     set_keylog_file(NULL, NULL);
     X509_free(s_cert);
     sk_X509_CRL_pop_free(crls, X509_CRL_free);