commit f716a700a11598ad70937503dd24ce7f219aa1fc
author Neil Armstrong <narmstrong@baylibre.com> Mon Apr 04 11:23:46 2022 +0200
committer Neil Armstrong <narmstrong@baylibre.com> Mon Apr 04 11:23:46 2022 +0200
tree 04afe7b402f007f76d72c7a0a946478f9404bf46
parent 91477a7964f2ad9dd3bef857ae008e8c01757e8e

Rename mbedtls_ssl_handshake_params variable ecdh_psa_shared_key to ecdh_psa_privkey_is_external

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

library/ssl_misc.h

diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index 00f3989..ea3fe1a 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -632,7 +632,7 @@
     psa_key_type_t ecdh_psa_type;
     size_t ecdh_bits;
     mbedtls_svc_key_id_t ecdh_psa_privkey;
-    uint8_t ecdh_psa_shared_key;
+    uint8_t ecdh_psa_privkey_is_external;
     unsigned char ecdh_psa_peerkey[MBEDTLS_PSA_MAX_EC_PUBKEY_LENGTH];
     size_t ecdh_psa_peerkey_len;
 #endif /* MBEDTLS_USE_PSA_CRYPTO || MBEDTLS_SSL_PROTO_TLS1_3 */

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index cc7d7e1..95ef032 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3146,7 +3146,7 @@
 
 #if defined(MBEDTLS_ECDH_C) && \
     ( defined(MBEDTLS_USE_PSA_CRYPTO) || defined(MBEDTLS_SSL_PROTO_TLS1_3) )
-    if( handshake->ecdh_psa_shared_key == 0 )
+    if( handshake->ecdh_psa_privkey_is_external == 0 )
         psa_destroy_key( handshake->ecdh_psa_privkey );
 #endif /* MBEDTLS_ECDH_C && MBEDTLS_USE_PSA_CRYPTO */
 

library/ssl_tls12_server.c

diff --git a/library/ssl_tls12_server.c b/library/ssl_tls12_server.c
index f3e9d14..e1e4b8a 100644
--- a/library/ssl_tls12_server.c
+++ b/library/ssl_tls12_server.c
@@ -2894,7 +2894,7 @@
         psa_reset_key_attributes( &key_attributes );
 
         /* Key should not be destroyed in the TLS library */
-        ssl->handshake->ecdh_psa_shared_key = 1;
+        ssl->handshake->ecdh_psa_privkey_is_external = 1;
 
         ret = 0;
         break;
@@ -3974,13 +3974,13 @@
         {
             ret = psa_ssl_status_to_mbedtls( status );
             MBEDTLS_SSL_DEBUG_RET( 1, "psa_raw_key_agreement", ret );
-            if( handshake->ecdh_psa_shared_key == 0 )
+            if( handshake->ecdh_psa_privkey_is_external == 0 )
                 (void) psa_destroy_key( handshake->ecdh_psa_privkey );
             handshake->ecdh_psa_privkey = MBEDTLS_SVC_KEY_ID_INIT;
             return( ret );
         }
 
-        if( handshake->ecdh_psa_shared_key == 0 )
+        if( handshake->ecdh_psa_privkey_is_external == 0 )
         {
             status = psa_destroy_key( handshake->ecdh_psa_privkey );