commit 316b162ac34456bb36e7f8cef37bd6a50f191048
author junyeonLEE <dlwnsdus2@naver.com> Wed Dec 20 16:29:30 2017 +0900
committer Azim Khan <Azim.Khan@arm.com> Wed Mar 21 14:15:28 2018 +0000
tree fc84b0edc881c800755dd32d046671e4df792a51
parent f3ada4adb00723a540a77de88a2831313b443190

Separate psk and psk_identity buffers free

Sometimes, psk_identity buffer can't released because psk buffer is NULL.
So, separate it.

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 236e52d..036876c 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -7741,10 +7741,14 @@
     if( conf->psk != NULL )
     {
         mbedtls_zeroize( conf->psk, conf->psk_len );
-        mbedtls_zeroize( conf->psk_identity, conf->psk_identity_len );
         mbedtls_free( conf->psk );
-        mbedtls_free( conf->psk_identity );
         conf->psk_len = 0;
+    }
+
+    if( conf->psk_identity != NULL )
+    {
+        mbedtls_zeroize( conf->psk_identity, conf->psk_identity_len );
+        mbedtls_free( conf->psk_identity );
         conf->psk_identity_len = 0;
     }
 #endif