commit a575975280bcacd212038298c3e6e21ea2546808
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri May 03 11:43:28 2019 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue May 07 09:59:32 2019 +0200
tree 4cab8bdce192e524d45194b45a3068dac104a98b
parent ed3b7a949254ceb698f245950fc3936f6c48f0b2

Make calc_verify() return the length as well

Simplifies ssl_compute_hash(), but unfortunately not so much the other uses.

library/ssl_cli.c

diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index ad7378f..d06984e 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -3217,7 +3217,7 @@
     unsigned char hash[48];
     unsigned char *hash_start = hash;
     mbedtls_md_type_t md_alg = MBEDTLS_MD_NONE;
-    unsigned int hashlen;
+    size_t hashlen;
     void *rs_ctx = NULL;
 
     MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> write certificate verify" ) );
@@ -3270,7 +3270,7 @@
 sign:
 #endif
 
-    ssl->handshake->calc_verify( ssl, hash );
+    ssl->handshake->calc_verify( ssl, hash, &hashlen );
 
 #if defined(MBEDTLS_SSL_PROTO_SSL3) || defined(MBEDTLS_SSL_PROTO_TLS1) || \
     defined(MBEDTLS_SSL_PROTO_TLS1_1)
@@ -3288,7 +3288,6 @@
          * sha_hash
          *     SHA(handshake_messages);
          */
-        hashlen = 36;
         md_alg = MBEDTLS_MD_NONE;
 
         /*