yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 03:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix MSVC 64-bit warnings

Browse Source 
"conversion from size_t to int, possible loss of data"
This commit is contained in:
Manuel Pégourié-Gonnard 2017-08-28 13:25:55 +02:00
parent 196d1338ba
commit bb216bd940
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbedtls/x509_crt.h
View File

@ -161,7 +161,7 @@ typedef struct {
typedef struct typedef struct
{ {
mbedtls_x509_crt_verify_chain_item items[MBEDTLS_X509_MAX_VERIFY_CHAIN_SIZE]; mbedtls_x509_crt_verify_chain_item items[MBEDTLS_X509_MAX_VERIFY_CHAIN_SIZE];
size_t len; unsigned len;
} mbedtls_x509_crt_verify_chain; } mbedtls_x509_crt_verify_chain;
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)

16
library/x509_crt.c
View File

@ -1983,8 +1983,8 @@ static int x509_crt_find_parent_in(
mbedtls_x509_crt **r_parent, mbedtls_x509_crt **r_parent,
int *r_signature_is_good, int *r_signature_is_good,
int top, int top,
int path_cnt, unsigned path_cnt,
int self_cnt, unsigned self_cnt,
mbedtls_x509_crt_restart_ctx *rs_ctx ) mbedtls_x509_crt_restart_ctx *rs_ctx )
{ {
int ret; int ret;
@ -2021,7 +2021,7 @@ static int x509_crt_find_parent_in(
/* +1 because stored max_pathlen is 1 higher that the actual value */ /* +1 because stored max_pathlen is 1 higher that the actual value */
if( parent->max_pathlen > 0 && if( parent->max_pathlen > 0 &&
parent->max_pathlen < 1 + path_cnt - self_cnt ) (size_t) parent->max_pathlen < 1 + path_cnt - self_cnt )
{ {
continue; continue;
} }
@ -2103,8 +2103,8 @@ static int x509_crt_find_parent(
mbedtls_x509_crt **parent, mbedtls_x509_crt **parent,
int *parent_is_trusted, int *parent_is_trusted,
int *signature_is_good, int *signature_is_good,
int path_cnt, unsigned path_cnt,
int self_cnt, unsigned self_cnt,
mbedtls_x509_crt_restart_ctx *rs_ctx ) mbedtls_x509_crt_restart_ctx *rs_ctx )
{ {
int ret; int ret;
@ -2246,7 +2246,7 @@ static int x509_crt_verify_chain(
int parent_is_trusted; int parent_is_trusted;
int child_is_trusted; int child_is_trusted;
int signature_is_good; int signature_is_good;
int self_cnt; unsigned self_cnt;
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
/* resume if we had an operation in progress */ /* resume if we had an operation in progress */
@ -2445,7 +2445,7 @@ static int x509_crt_merge_flags_with_cb(
void *p_vrfy ) void *p_vrfy )
{ {
int ret; int ret;
size_t i; unsigned i;
uint32_t cur_flags; uint32_t cur_flags;
const mbedtls_x509_crt_verify_chain_item *cur; const mbedtls_x509_crt_verify_chain_item *cur;
@ -2455,7 +2455,7 @@ static int x509_crt_merge_flags_with_cb(
cur_flags = cur->flags; cur_flags = cur->flags;
if( NULL != f_vrfy ) if( NULL != f_vrfy )
if( ( ret = f_vrfy( p_vrfy, cur->crt, i-1, &cur_flags ) ) != 0 ) if( ( ret = f_vrfy( p_vrfy, cur->crt, (int) i-1, &cur_flags ) ) != 0 )
return( ret ); return( ret );
*flags |= cur_flags; *flags |= cur_flags;