commit aaad2b6bfc70302b04ce0fa7e0ac1b59318cbf95
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Jul 04 11:35:16 2023 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Jul 04 11:35:16 2023 +0200
tree 8ca8ce28a19d6733b076678ed50abcd96945f160
parent de33278e43a488fa6680270b42d52ebd84e677d0

Rename some local variables

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 876a32e..4df55db 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -6608,18 +6608,18 @@
                                    size_t *hlen)
 {
     psa_status_t status;
-    psa_hash_operation_t copy = psa_hash_operation_init();
+    psa_hash_operation_t cloned_op = psa_hash_operation_init();
 
 #if !defined(MBEDTLS_DEBUG_C)
     (void) ssl;
 #endif
     MBEDTLS_SSL_DEBUG_MSG(2, ("=> PSA calc verify"));
-    status = psa_hash_clone(hs_op, &copy);
+    status = psa_hash_clone(hs_op, &cloned_op);
     if (status != PSA_SUCCESS) {
         goto exit;
     }
 
-    status = psa_hash_finish(&copy, hash, buffer_size, hlen);
+    status = psa_hash_finish(&cloned_op, hash, buffer_size, hlen);
     if (status != PSA_SUCCESS) {
         goto exit;
     }
@@ -6628,7 +6628,7 @@
     MBEDTLS_SSL_DEBUG_MSG(2, ("<= PSA calc verify"));
 
 exit:
-    psa_hash_abort(&copy);
+    psa_hash_abort(&cloned_op);
     return mbedtls_md_error_from_psa(status);
 }
 #else
@@ -6638,25 +6638,25 @@
                                       size_t *hlen)
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
-    mbedtls_md_context_t copy;
+    mbedtls_md_context_t cloned_ctx;
 
-    mbedtls_md_init(&copy);
+    mbedtls_md_init(&cloned_ctx);
 
 #if !defined(MBEDTLS_DEBUG_C)
     (void) ssl;
 #endif
     MBEDTLS_SSL_DEBUG_MSG(2, ("=> calc verify"));
 
-    ret = mbedtls_md_setup(&copy, mbedtls_md_info_from_ctx(hs_ctx), 0);
+    ret = mbedtls_md_setup(&cloned_ctx, mbedtls_md_info_from_ctx(hs_ctx), 0);
     if (ret != 0) {
         goto exit;
     }
-    ret = mbedtls_md_clone(&copy, hs_ctx);
+    ret = mbedtls_md_clone(&cloned_ctx, hs_ctx);
     if (ret != 0) {
         goto exit;
     }
 
-    ret = mbedtls_md_finish(&copy, hash);
+    ret = mbedtls_md_finish(&cloned_ctx, hash);
     if (ret != 0) {
         goto exit;
     }
@@ -6667,7 +6667,7 @@
     MBEDTLS_SSL_DEBUG_MSG(2, ("<= calc verify"));
 
 exit:
-    mbedtls_md_free(&copy);
+    mbedtls_md_free(&cloned_ctx);
     return ret;
 }
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
@@ -7648,13 +7648,13 @@
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
     psa_status_t status;
     psa_hash_operation_t *hs_op = ctx;
-    psa_hash_operation_t copy = PSA_HASH_OPERATION_INIT;
+    psa_hash_operation_t cloned_op = PSA_HASH_OPERATION_INIT;
     size_t hash_size;
 #else
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     mbedtls_md_context_t *hs_ctx = ctx;
-    mbedtls_md_context_t copy;
-    mbedtls_md_init(&copy);
+    mbedtls_md_context_t cloned_ctx;
+    mbedtls_md_init(&cloned_ctx);
 #endif
 
     mbedtls_ssl_session *session = ssl->session_negotiate;
@@ -7669,12 +7669,12 @@
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
     MBEDTLS_SSL_DEBUG_MSG(2, ("=> calc PSA finished tls"));
 
-    status = psa_hash_clone(hs_op, &copy);
+    status = psa_hash_clone(hs_op, &cloned_op);
     if (status != PSA_SUCCESS) {
         goto exit;
     }
 
-    status = psa_hash_finish(&copy, padbuf, hlen, &hash_size);
+    status = psa_hash_finish(&cloned_op, padbuf, hlen, &hash_size);
     if (status != PSA_SUCCESS) {
         goto exit;
     }
@@ -7682,16 +7682,16 @@
 #else
     MBEDTLS_SSL_DEBUG_MSG(2, ("=> calc finished tls"));
 
-    ret = mbedtls_md_setup(&copy, mbedtls_md_info_from_ctx(hs_ctx), 0);
+    ret = mbedtls_md_setup(&cloned_ctx, mbedtls_md_info_from_ctx(hs_ctx), 0);
     if (ret != 0) {
         goto exit;
     }
-    ret = mbedtls_md_clone(&copy, hs_ctx);
+    ret = mbedtls_md_clone(&cloned_ctx, hs_ctx);
     if (ret != 0) {
         goto exit;
     }
 
-    ret = mbedtls_md_finish(&copy, padbuf);
+    ret = mbedtls_md_finish(&cloned_ctx, padbuf);
     if (ret != 0) {
         goto exit;
     }
@@ -7715,10 +7715,10 @@
 
 exit:
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    psa_hash_abort(&copy);
+    psa_hash_abort(&cloned_op);
     return mbedtls_md_error_from_psa(status);
 #else
-    mbedtls_md_free(&copy);
+    mbedtls_md_free(&cloned_ctx);
     return ret;
 #endif /* MBEDTLS_USE_PSA_CRYPTO */
 }