commit 972fba51ed382be9c5f0c672999bac20a73d7749
author Andrzej Kurek <andrzej.kurek@mobica.com> Wed Jan 30 03:29:12 2019 -0500
committer Andrzej Kurek <andrzej.kurek@mobica.com> Wed Jan 30 03:29:12 2019 -0500
tree 655779395870e06d8bbc903e31a2f306cfdb94f3
parent eb342241a57f8ebddf0278416163ae3be2c519e7

ssl_tls: rename sha_512_psa to sha_384_psa

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 159291f..c34ab62 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1410,17 +1410,17 @@
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
     size_t hash_size;
     psa_status_t status;
-    psa_hash_operation_t sha512_psa = psa_hash_operation_init();
+    psa_hash_operation_t sha384_psa = psa_hash_operation_init();
 
     MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> PSA calc verify sha384" ) );
-    status = psa_hash_clone( &ssl->handshake->fin_sha512_psa, &sha512_psa );
+    status = psa_hash_clone( &ssl->handshake->fin_sha384_psa, &sha384_psa );
     if( status != PSA_SUCCESS )
     {
         MBEDTLS_SSL_DEBUG_MSG( 2, ( "PSA hash clone failed" ) );
         return;
     }
 
-    status = psa_hash_finish( &sha512_psa, hash, 48, &hash_size );
+    status = psa_hash_finish( &sha384_psa, hash, 48, &hash_size );
     if( status != PSA_SUCCESS )
     {
         MBEDTLS_SSL_DEBUG_MSG( 2, ( "PSA hash finish failed" ) );
@@ -6221,7 +6221,7 @@
 #endif
 #if defined(MBEDTLS_SHA512_C)
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    psa_hash_setup( &ssl->handshake->fin_sha512_psa, PSA_ALG_SHA_384 );
+    psa_hash_setup( &ssl->handshake->fin_sha384_psa, PSA_ALG_SHA_384 );
 #else
     mbedtls_sha512_starts_ret( &ssl->handshake->fin_sha512, 1 );
 #endif
@@ -6247,7 +6247,7 @@
 #endif
 #if defined(MBEDTLS_SHA512_C)
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    psa_hash_update( &ssl->handshake->fin_sha512_psa, buf, len );
+    psa_hash_update( &ssl->handshake->fin_sha384_psa, buf, len );
 #else
     mbedtls_sha512_update_ret( &ssl->handshake->fin_sha512, buf, len );
 #endif
@@ -6283,7 +6283,7 @@
                                         const unsigned char *buf, size_t len )
 {
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    psa_hash_update( &ssl->handshake->fin_sha512_psa, buf, len );
+    psa_hash_update( &ssl->handshake->fin_sha384_psa, buf, len );
 #else
     mbedtls_sha512_update_ret( &ssl->handshake->fin_sha512, buf, len );
 #endif
@@ -6521,7 +6521,7 @@
     unsigned char padbuf[48];
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
     size_t hash_size;
-    psa_hash_operation_t sha512_psa;
+    psa_hash_operation_t sha384_psa;
     psa_status_t status;
 #else
     mbedtls_sha512_context sha512;
@@ -6536,18 +6536,18 @@
                 : "server finished";
 
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    sha512_psa = psa_hash_operation_init();
+    sha384_psa = psa_hash_operation_init();
 
     MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> calc PSA finished tls sha384" ) );
 
-    status = psa_hash_clone( &ssl->handshake->fin_sha512_psa, &sha512_psa );
+    status = psa_hash_clone( &ssl->handshake->fin_sha384_psa, &sha384_psa );
     if( status != PSA_SUCCESS )
     {
         MBEDTLS_SSL_DEBUG_MSG( 2, ( "PSA hash clone failed" ) );
         return;
     }
 
-    status = psa_hash_finish( &sha512_psa, padbuf, sizeof( padbuf ), &hash_size );
+    status = psa_hash_finish( &sha384_psa, padbuf, sizeof( padbuf ), &hash_size );
     if( status != PSA_SUCCESS )
     {
         MBEDTLS_SSL_DEBUG_MSG( 2, ( "PSA hash finish failed" ) );
@@ -6901,8 +6901,8 @@
 #endif
 #if defined(MBEDTLS_SHA512_C)
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    handshake->fin_sha512_psa = psa_hash_operation_init();
-    psa_hash_setup( &handshake->fin_sha512_psa, PSA_ALG_SHA_384 );
+    handshake->fin_sha384_psa = psa_hash_operation_init();
+    psa_hash_setup( &handshake->fin_sha384_psa, PSA_ALG_SHA_384 );
 #else
     mbedtls_sha512_init(   &handshake->fin_sha512    );
     mbedtls_sha512_starts_ret( &handshake->fin_sha512, 1 );
@@ -9218,7 +9218,7 @@
 #endif
 #if defined(MBEDTLS_SHA512_C)
 #if defined(MBEDTLS_USE_PSA_CRYPTO)
-    psa_hash_abort( &handshake->fin_sha512_psa );
+    psa_hash_abort( &handshake->fin_sha384_psa );
 #else
     mbedtls_sha512_free(   &handshake->fin_sha512    );
 #endif