commit 4f4849a379a0f238a350ff07d932705a03f31185
author Arto Kinnunen <arto.kinnunen@arm.com> Mon Sep 09 10:21:18 2019 +0300
committer Arto Kinnunen <arto.kinnunen@arm.com> Mon Sep 09 17:21:18 2019 +0300
tree 06cd32057aad1a2782ae63c4ebe95de967778ab0
parent 6e3f09b43132efdf2a51eb4cec30a2c583cfa473

Review corrections 2

-Fix MSVC compiler warnings about size_t to uint32_t conversions by
 updating GET/PUT functions signature to use size_t.
-Add type casts to functions calling GET/PUT conversions
-Remove additional space after return statement

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 4601574..fa073e4 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -756,7 +756,8 @@
 
     while( ec_tls_ids_len-- != 0 )
     {
-        uint16_t const cur_tls_id = mbedtls_platform_get_uint16_be( acceptable_ec_tls_ids );
+        uint16_t const cur_tls_id = (uint16_t)
+            mbedtls_platform_get_uint16_be( acceptable_ec_tls_ids );
 
         if( cur_tls_id == tls_id )
             return( 0 );
@@ -1166,9 +1167,9 @@
      */
     MBEDTLS_SSL_DEBUG_BUF( 4, "record contents", buf, n );
 
-    ciph_len = mbedtls_platform_get_uint16_be( &buf[0] );
-    sess_len = mbedtls_platform_get_uint16_be( &buf[2] );
-    chal_len = mbedtls_platform_get_uint16_be( &buf[4] );
+    ciph_len = (unsigned int)mbedtls_platform_get_uint16_be( &buf[0] );
+    sess_len = (unsigned int)mbedtls_platform_get_uint16_be( &buf[2] );
+    chal_len = (unsigned int)mbedtls_platform_get_uint16_be( &buf[4] );
 
     MBEDTLS_SSL_DEBUG_MSG( 3, ( "ciph_len: %d, sess_len: %d, chal_len: %d",
                    ciph_len, sess_len, chal_len ) );
@@ -1582,7 +1583,8 @@
         if( ssl->renego_status == MBEDTLS_SSL_RENEGOTIATION_IN_PROGRESS )
         {
             /* This couldn't be done in ssl_prepare_handshake_record() */
-            unsigned int cli_msg_seq = mbedtls_platform_get_uint16_be( &ssl->in_msg[4] );
+            unsigned int cli_msg_seq = (unsigned int)
+                mbedtls_platform_get_uint16_be( &ssl->in_msg[4] );
 
             if( cli_msg_seq != ssl->handshake->in_msg_seq )
             {
@@ -1597,7 +1599,8 @@
         else
 #endif
         {
-            unsigned int cli_msg_seq = mbedtls_platform_get_uint16_be( &ssl->in_msg[4] );
+            unsigned int cli_msg_seq = (unsigned int)
+                mbedtls_platform_get_uint16_be( &ssl->in_msg[4] );
 
             ssl->handshake->out_msg_seq = cli_msg_seq;
             ssl->handshake->in_msg_seq  = cli_msg_seq + 1;