commit d9e068e10b4b6aa7134af9667c035462e2cd2de5
author XiaokangQian <xiaokang.qian@arm.com> Tue Jan 18 06:23:32 2022 +0000
committer XiaokangQian <xiaokang.qian@arm.com> Wed Jan 26 10:51:13 2022 +0000
tree cc4ca9e5fc654afaae876dda982e9b1680548f20
parent 8945db36ab6ddc132e5ca44ca9cda8da8c9dbe11

Change code based on comments

Align coding styles
Add hrr parameter for ssl_tls13_parse_server_hello
Add reset steps for SHA384 in HRR

Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 290c75e..940b306 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -7630,9 +7630,9 @@
         return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
 
     ret = mbedtls_ssl_get_handshake_transcript( ssl, md,
-                                          transcript + 4,
-                                          len - 4,
-                                          &hash_size );
+                                                transcript + 4,
+                                                len - 4,
+                                                &hash_size );
     if( ret != 0 )
     {
         MBEDTLS_SSL_DEBUG_RET( 4, "mbedtls_ssl_get_handshake_transcript", ret );
@@ -7689,7 +7689,7 @@
     ssl_update_checksum_sha256( ssl, hash_transcript, hash_olen );
 #endif /* MBEDTLS_SHA256_C */
 
-#if defined(MBEDTLS_SHA512_C)
+#if defined(MBEDTLS_SHA384_C)
     ret = ssl_hash_transcript_core( ssl, MBEDTLS_MD_SHA384,
                                     hash_transcript,
                                     sizeof( hash_transcript ),
@@ -7701,7 +7701,15 @@
     }
     MBEDTLS_SSL_DEBUG_BUF( 4, "Truncated SHA-384 handshake transcript",
                            hash_transcript, hash_olen );
-#endif /* MBEDTLS_SHA512_C */
+
+#if defined(MBEDTLS_USE_PSA_CRYPTO)
+    psa_hash_abort( &ssl->handshake->fin_sha384_psa );
+    psa_hash_setup( &ssl->handshake->fin_sha384_psa, PSA_ALG_SHA_384 );
+#else
+    mbedtls_sha512_starts( &ssl->handshake->fin_sha512, 1 );
+#endif
+    ssl_update_checksum_sha384( ssl, hash_transcript, hash_olen );
+#endif /* MBEDTLS_SHA384_C */
 
     return( ret );
 }