commit d29e13eb1bc1d17344cb4d7e26c2c79509540dce
author Ronald Cron <ronald.cron@arm.com> Wed Oct 19 10:33:48 2022 +0200
committer Ronald Cron <ronald.cron@arm.com> Fri Oct 21 14:34:20 2022 +0200
tree c48cc0985ef5b8d56f92954ea92ffa65fe8d670a
parent 2a87e9bf83640e3b1bc86679c52656c26a0212c2

tls: Use the same function in TLS 1.2 and 1.3 to check PSK conf

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

library/ssl_tls13_client.c

diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 8510d8f..4aba59f 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -728,11 +728,6 @@
 }
 #endif /* MBEDTLS_SSL_SESSION_TICKETS */
 
-static int ssl_tls13_has_configured_psk( const mbedtls_ssl_config *conf )
-{
-    return( conf->psk != NULL && conf->psk_identity != NULL );
-}
-
 MBEDTLS_CHECK_RETURN_CRITICAL
 static int ssl_tls13_psk_get_identity( mbedtls_ssl_context *ssl,
                                        psa_algorithm_t *hash_alg,
@@ -740,7 +735,7 @@
                                        size_t *identity_len )
 {
 
-    if( !ssl_tls13_has_configured_psk( ssl->conf ) )
+    if( !mbedtls_ssl_conf_has_static_psk( ssl->conf ) )
         return( -1 );
 
     *hash_alg = PSA_ALG_SHA_256;
@@ -756,7 +751,7 @@
                                   size_t *psk_len )
 {
 
-    if( !ssl_tls13_has_configured_psk( ssl->conf ) )
+    if( !mbedtls_ssl_conf_has_static_psk( ssl->conf ) )
         return( -1 );
 
     *hash_alg = PSA_ALG_SHA_256;
@@ -775,7 +770,7 @@
         configured_psk_count++;
     }
 #endif
-    if( ssl_tls13_has_configured_psk( ssl->conf ) )
+    if( mbedtls_ssl_conf_has_static_psk( ssl->conf ) )
     {
         MBEDTLS_SSL_DEBUG_MSG( 3, ( "PSK is configured" ) );
         configured_psk_count++;
@@ -1094,7 +1089,7 @@
     }
     else
 #endif
-    if( ssl_tls13_has_configured_psk( ssl->conf ) )
+    if( mbedtls_ssl_conf_has_static_psk( ssl->conf ) )
     {
         ret = ssl_tls13_psk_get_psk( ssl, &hash_alg, &psk, &psk_len );
     }