lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-07 06:42:56 +03:00
Code Activity

Make size_t -> int downcasts explicit

Browse Source 
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>
This commit is contained in:
Gilles Peskine
2021-09-01 11:19:33 +02:00
parent 6ac8f94a72
commit 88d681ca35
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/ssl_tls.c
View File

@@ -689,7 +689,7 @@ static int ssl_tls12_populate_transform( mbedtls_ssl_transform *transform,
unsigned char *mac_dec; unsigned char *mac_dec;
size_t mac_key_len = 0; size_t mac_key_len = 0;
size_t iv_copy_len; size_t iv_copy_len;
unsigned keylen; size_t keylen;
const mbedtls_ssl_ciphersuite_t *ciphersuite_info; const mbedtls_ssl_ciphersuite_t *ciphersuite_info;
const mbedtls_cipher_info_t *cipher_info; const mbedtls_cipher_info_t *cipher_info;
const mbedtls_md_info_t *md_info; const mbedtls_md_info_t *md_info;
@@ -1060,7 +1060,7 @@ static int ssl_tls12_populate_transform( mbedtls_ssl_transform *transform,
} }
if( ( ret = mbedtls_cipher_setkey( &transform->cipher_ctx_enc, key1, 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_ENCRYPT ) ) != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_setkey", ret ); MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_setkey", ret );
@@ -1068,7 +1068,7 @@ static int ssl_tls12_populate_transform( mbedtls_ssl_transform *transform,
} }
if( ( ret = mbedtls_cipher_setkey( &transform->cipher_ctx_dec, key2, 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_DECRYPT ) ) != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_setkey", ret ); MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_cipher_setkey", ret );

4
programs/aes/crypt_and_hash.c
View File

@@ -311,7 +311,7 @@ int main( int argc, char *argv[] )
if( mbedtls_cipher_setkey( &cipher_ctx, if( mbedtls_cipher_setkey( &cipher_ctx,
digest, digest,
mbedtls_cipher_info_get_key_bitlen( cipher_info ), (int) mbedtls_cipher_info_get_key_bitlen( cipher_info ),
MBEDTLS_ENCRYPT ) != 0 ) MBEDTLS_ENCRYPT ) != 0 )
{ {
mbedtls_fprintf( stderr, "mbedtls_cipher_setkey() returned error\n"); mbedtls_fprintf( stderr, "mbedtls_cipher_setkey() returned error\n");
@@ -452,7 +452,7 @@ int main( int argc, char *argv[] )
if( mbedtls_cipher_setkey( &cipher_ctx, if( mbedtls_cipher_setkey( &cipher_ctx,
digest, digest,
mbedtls_cipher_info_get_key_bitlen( cipher_info ), (int) mbedtls_cipher_info_get_key_bitlen( cipher_info ),
MBEDTLS_DECRYPT ) != 0 ) MBEDTLS_DECRYPT ) != 0 )
{ {
mbedtls_fprintf( stderr, "mbedtls_cipher_setkey() returned error\n" ); mbedtls_fprintf( stderr, "mbedtls_cipher_setkey() returned error\n" );