commit 88d681ca35a11644a4c492c8a6d8cfd90e0ef391
author Gilles Peskine <Gilles.Peskine@arm.com> Wed Sep 01 11:19:33 2021 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Sep 01 16:57:23 2021 +0200
tree ad6d64dc2b1f8ddfb3cf94595420a3c01c5b3b9d
parent 6ac8f94a72cb75071c79797908c4927b37e2f85a

Make size_t -> int downcasts explicit

mbedtls_cipher_setkey takes an int argument. Cast explicitly, otherwise MSVC
complains.

Where possible, just stick to size_t.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 1e81384..754c76f 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -689,7 +689,7 @@
     unsigned char *mac_dec;
     size_t mac_key_len = 0;
     size_t iv_copy_len;
-    unsigned keylen;
+    size_t keylen;
     const mbedtls_ssl_ciphersuite_t *ciphersuite_info;
     const mbedtls_cipher_info_t *cipher_info;
     const mbedtls_md_info_t *md_info;
@@ -1060,7 +1060,7 @@
     }
 
     if( ( ret = mbedtls_cipher_setkey( &transform->cipher_ctx_enc, key1,
-                               mbedtls_cipher_info_get_key_bitlen( cipher_info ),
+                               (int) mbedtls_cipher_info_get_key_bitlen( cipher_info ),
                                MBEDTLS_ENCRYPT ) ) != 0 )
     {
         MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_setkey", ret );
@@ -1068,7 +1068,7 @@
     }
 
     if( ( ret = mbedtls_cipher_setkey( &transform->cipher_ctx_dec, key2,
-                               mbedtls_cipher_info_get_key_bitlen( cipher_info ),
+                               (int) mbedtls_cipher_info_get_key_bitlen( cipher_info ),
                                MBEDTLS_DECRYPT ) ) != 0 )
     {
         MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_setkey", ret );

programs/aes/crypt_and_hash.c

diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c
index ba9827f..5ed2ece 100644
--- a/programs/aes/crypt_and_hash.c
+++ b/programs/aes/crypt_and_hash.c
@@ -311,7 +311,7 @@
 
         if( mbedtls_cipher_setkey( &cipher_ctx,
                                    digest,
-                                   mbedtls_cipher_info_get_key_bitlen( cipher_info ),
+                                   (int) mbedtls_cipher_info_get_key_bitlen( cipher_info ),
                            MBEDTLS_ENCRYPT ) != 0 )
         {
             mbedtls_fprintf( stderr, "mbedtls_cipher_setkey() returned error\n");
@@ -452,7 +452,7 @@
 
         if( mbedtls_cipher_setkey( &cipher_ctx,
                                    digest,
-                                   mbedtls_cipher_info_get_key_bitlen( cipher_info ),
+                                   (int) mbedtls_cipher_info_get_key_bitlen( cipher_info ),
                            MBEDTLS_DECRYPT ) != 0 )
         {
             mbedtls_fprintf( stderr, "mbedtls_cipher_setkey() returned error\n" );