yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 23:35:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for MSVC Compiler warnings

Browse source 
Fixes Microsoft Visual C compiler warnings in multiple files. All issues
with type mismatches.
This commit is contained in:
Simon B 2016-11-10 13:19:42 +00:00 committed by Janos Follath
parent c1d54bb7b2
commit a697bf503a
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/ccm.c
View file

@ -140,7 +140,7 @@ static int ccm_auth_crypt( ccm_context *ctx, int mode, size_t length,
{ {
int ret; int ret;
unsigned char i; unsigned char i;
unsigned char q = 16 - 1 - iv_len; unsigned char q;
size_t len_left, olen; size_t len_left, olen;
unsigned char b[16]; unsigned char b[16];
unsigned char y[16]; unsigned char y[16];
@ -163,6 +163,8 @@ static int ccm_auth_crypt( ccm_context *ctx, int mode, size_t length,
if( add_len > 0xFF00 ) if( add_len > 0xFF00 )
return( POLARSSL_ERR_CCM_BAD_INPUT ); return( POLARSSL_ERR_CCM_BAD_INPUT );
q = 16 - 1 - (unsigned char) iv_len;
/* /*
* First block B_0: * First block B_0:
* 0 .. 0 flags * 0 .. 0 flags
@ -254,7 +256,7 @@ static int ccm_auth_crypt( ccm_context *ctx, int mode, size_t length,
while( len_left > 0 ) while( len_left > 0 )
{ {
unsigned char use_len = len_left > 16 ? 16 : len_left; size_t use_len = len_left > 16 ? 16 : len_left;
if( mode == CCM_ENCRYPT ) if( mode == CCM_ENCRYPT )
{ {

10
library/ssl_srv.c
View file

@ -2981,7 +2981,17 @@ static int ssl_parse_encrypted_pms( ssl_context *ssl,
ssl->handshake->pmslen = 48; ssl->handshake->pmslen = 48;
/* mask = diff ? 0xff : 0x00 */ /* mask = diff ? 0xff : 0x00 */
/* MSVC has a warning about unary minus on unsigned, but this is
* well-defined and precisely what we want to do here */
#if defined(_MSC_VER)
#pragma warning( push )
#pragma warning( disable : 4146 )
#endif
mask = - ( diff | - diff ) >> ( sizeof( unsigned int ) * 8 - 1 ); mask = - ( diff | - diff ) >> ( sizeof( unsigned int ) * 8 - 1 );
#if defined(_MSC_VER)
#pragma warning( pop )
#endif
for( i = 0; i < ssl->handshake->pmslen; i++ ) for( i = 0; i < ssl->handshake->pmslen; i++ )
pms[i] = ( mask & fake_pms[i] ) | ( (~mask) & peer_pms[i] ); pms[i] = ( mask & fake_pms[i] ) | ( (~mask) & peer_pms[i] );

2
library/ssl_tls.c
View file

@ -1484,7 +1484,7 @@ static int ssl_decrypt_buf( ssl_context *ssl )
unsigned char add_data[13]; unsigned char add_data[13];
unsigned char taglen = ssl->transform_in->ciphersuite_info->flags & unsigned char taglen = ssl->transform_in->ciphersuite_info->flags &
POLARSSL_CIPHERSUITE_SHORT_TAG ? 8 : 16; POLARSSL_CIPHERSUITE_SHORT_TAG ? 8 : 16;
unsigned char explicit_iv_len = ssl->transform_in->ivlen - size_t explicit_iv_len = ssl->transform_in->ivlen -
ssl->transform_in->fixed_ivlen; ssl->transform_in->fixed_ivlen;
if( ssl->in_msglen < (size_t) explicit_iv_len + taglen ) if( ssl->in_msglen < (size_t) explicit_iv_len + taglen )

2
library/x509_crt.c
View file

@ -988,7 +988,7 @@ int x509_crt_parse_path( x509_crt *chain, const char *path )
p = filename + len; p = filename + len;
filename[len++] = '*'; filename[len++] = '*';
w_ret = MultiByteToWideChar( CP_ACP, 0, filename, len, szDir, w_ret = MultiByteToWideChar( CP_ACP, 0, filename, (int)len, szDir,
MAX_PATH - 3 ); MAX_PATH - 3 );
if( w_ret == 0 ) if( w_ret == 0 )
return( POLARSSL_ERR_X509_BAD_INPUT_DATA ); return( POLARSSL_ERR_X509_BAD_INPUT_DATA );