commit c6088eceb41727ff9e66c577e53e0a0baf4d4935
author Tom Cosgrove <tom.cosgrove@arm.com> Thu Dec 21 13:28:09 2023 +0000
committer GitHub <noreply@github.com> Thu Dec 21 13:28:09 2023 +0000
tree 3f65c1cbae7f7ccf7d26c21c3e51423c56bef12b
parent 907cb020ef6571c099a69f0f45ecdd80d609de26
parent 4fb1955b3184244ccd7e3c0066fb3b19457ca615

Merge pull request #8384 from paul-elliott-arm/remove_ssl_null_tls12

Remove NULLing of ssl context in TLS1.2 transform population

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 1536d04..e1fb128 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -8215,14 +8215,6 @@
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 #endif
 
-#if !defined(MBEDTLS_DEBUG_C) && \
-    !defined(MBEDTLS_SSL_DTLS_CONNECTION_ID)
-    if (ssl->f_export_keys == NULL) {
-        ssl = NULL; /* make sure we don't use it except for these cases */
-        (void) ssl;
-    }
-#endif
-
     /*
      * Some data just needs copying into the structure
      */
@@ -8494,7 +8486,7 @@
         goto end;
     }
 
-    if (ssl != NULL && ssl->f_export_keys != NULL) {
+    if (ssl->f_export_keys != NULL) {
         ssl->f_export_keys(ssl->p_export_keys,
                            MBEDTLS_SSL_KEY_EXPORT_TLS12_MASTER_SECRET,
                            master, 48,