commit 520224e577e14be0cecb55e203586c3f5844d83c
author Hanno Becker <hanno.becker@arm.com> Fri Oct 26 11:38:07 2018 +0100
committer Hanno Becker <hanno.becker@arm.com> Wed Nov 21 21:12:58 2018 +0000
tree 42fb0d879172498f8e1aba2298b4b1f9a2b5f659
parent b64ba5f2c0f30811eabadef7d887aa161353a11a

Rename ssl_conf_has_[raw_]_psk to ssl_conf_has_static_[raw_]psk

This is to differentiate the function from the functions relevant
on the server-side, which also need to take into the PSK callback.

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 3f91d4f..cd25dca 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -52,7 +52,7 @@
 #endif
 
 #if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)
-static int ssl_conf_has_psk( mbedtls_ssl_config const *conf )
+static int ssl_conf_has_static_psk( mbedtls_ssl_config const *conf )
 {
     if( conf->psk_identity     == NULL ||
         conf->psk_identity_len == 0     )
@@ -72,7 +72,7 @@
 }
 
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-static int ssl_conf_has_raw_psk( mbedtls_ssl_config const *conf )
+static int ssl_conf_has_static_raw_psk( mbedtls_ssl_config const *conf )
 {
     if( conf->psk_identity     == NULL ||
         conf->psk_identity_len == 0     )
@@ -795,7 +795,7 @@
     /* Don't suggest PSK-based ciphersuite if no PSK is available. */
 #if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED)
     if( mbedtls_ssl_ciphersuite_uses_psk( suite_info ) &&
-        ssl_conf_has_psk( ssl->conf ) == 0 )
+        ssl_conf_has_static_psk( ssl->conf ) == 0 )
     {
         return( 1 );
     }
@@ -3054,7 +3054,7 @@
         /*
          * opaque psk_identity<0..2^16-1>;
          */
-        if( ssl_conf_has_psk( ssl->conf ) == 0 )
+        if( ssl_conf_has_static_psk( ssl->conf ) == 0 )
         {
             /* We don't offer PSK suites if we don't have a PSK,
              * and we check that the server's choice is among the
@@ -3090,7 +3090,7 @@
         {
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
             /* Opaque PSKs are currently only supported for PSK-only suites. */
-            if( ssl_conf_has_raw_psk( ssl->conf ) == 0 )
+            if( ssl_conf_has_static_raw_psk( ssl->conf ) == 0 )
                 return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
 
@@ -3104,7 +3104,7 @@
         {
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
             /* Opaque PSKs are currently only supported for PSK-only suites. */
-            if( ssl_conf_has_raw_psk( ssl->conf ) == 0 )
+            if( ssl_conf_has_static_raw_psk( ssl->conf ) == 0 )
                 return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
 
@@ -3140,7 +3140,7 @@
         {
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
             /* Opaque PSKs are currently only supported for PSK-only suites. */
-            if( ssl_conf_has_raw_psk( ssl->conf ) == 0 )
+            if( ssl_conf_has_static_raw_psk( ssl->conf ) == 0 )
                 return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
 
@@ -3169,7 +3169,7 @@
     defined(MBEDTLS_KEY_EXCHANGE_PSK_ENABLED)
         if( ciphersuite_info->key_exchange == MBEDTLS_KEY_EXCHANGE_PSK &&
             ssl->minor_ver == MBEDTLS_SSL_MINOR_VERSION_3 &&
-            ssl_conf_has_raw_psk( ssl->conf ) == 0 )
+            ssl_conf_has_static_raw_psk( ssl->conf ) == 0 )
         {
             MBEDTLS_SSL_DEBUG_MSG( 1, ( "skip PMS generation for opaque PSK" ) );
         }