yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-27 02:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings

Browse Source
This commit is contained in:
Jarno Lamsa 2019-06-06 15:10:07 +03:00
parent c2376f049a
commit 15b3a7ae4d
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
programs/ssl/ssl_client2.c
View File

@ -2921,13 +2921,13 @@ send_request:
#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION) #if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
if( opt.serialize != 0 ) if( opt.serialize != 0 )
{ {
size_t len; size_t buf_len;
unsigned char *buf = NULL; unsigned char *context_buf = NULL;
opt.serialize = 0; opt.serialize = 0;
mbedtls_printf( " Serializing live connection..." ); mbedtls_printf( " Serializing live connection..." );
ret = mbedtls_ssl_context_save( &ssl, NULL, 0, &len ); ret = mbedtls_ssl_context_save( &ssl, NULL, 0, &buf_len );
/* Allow stub implementation returning 0 for now */ /* Allow stub implementation returning 0 for now */
if( ret != MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL && if( ret != MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL &&
@ -2939,7 +2939,7 @@ send_request:
goto exit; goto exit;
} }
if( ( buf = mbedtls_calloc( 1, len ) ) == NULL ) if( ( context_buf = mbedtls_calloc( 1, buf_len ) ) == NULL )
{ {
mbedtls_printf( " failed\n ! Couldn't allocate buffer for " mbedtls_printf( " failed\n ! Couldn't allocate buffer for "
"serialized context" ); "serialized context" );
@ -2947,7 +2947,7 @@ send_request:
goto exit; goto exit;
} }
if( ( ret = mbedtls_ssl_context_save( &ssl, buf, len, &len ) ) != 0 ) if( ( ret = mbedtls_ssl_context_save( &ssl, context_buf, buf_len, &buf_len ) ) != 0 )
{ {
mbedtls_printf( "failed\n ! mbedtls_ssl_context_save returned " mbedtls_printf( "failed\n ! mbedtls_ssl_context_save returned "
"-0x%x\n\n", -ret ); "-0x%x\n\n", -ret );
@ -2979,7 +2979,7 @@ send_request:
mbedtls_printf( " Deserializing connection..." ); mbedtls_printf( " Deserializing connection..." );
if( ( ret = mbedtls_ssl_context_load( &ssl, buf, len ) ) != 0 ) if( ( ret = mbedtls_ssl_context_load( &ssl, context_buf, buf_len ) ) != 0 )
{ {
mbedtls_printf( "failed\n ! mbedtls_ssl_context_load returned " mbedtls_printf( "failed\n ! mbedtls_ssl_context_load returned "
"-0x%x\n\n", -ret ); "-0x%x\n\n", -ret );

12
programs/ssl/ssl_server2.c
View File

@ -3932,13 +3932,13 @@ data_exchange:
#if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION) #if defined(MBEDTLS_SSL_CONTEXT_SERIALIZATION)
if( opt.serialize != 0 ) if( opt.serialize != 0 )
{ {
size_t len; size_t buf_len;
unsigned char *buf = NULL; unsigned char *context_buf = NULL;
opt.serialize = 0; opt.serialize = 0;
mbedtls_printf( " Serializing live connection..." ); mbedtls_printf( " Serializing live connection..." );
ret = mbedtls_ssl_context_save( &ssl, NULL, 0, &len ); ret = mbedtls_ssl_context_save( &ssl, NULL, 0, &buf_len );
/* Allow stub implementation returning 0 for now */ /* Allow stub implementation returning 0 for now */
if( ret != MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL && if( ret != MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL &&
@ -3950,7 +3950,7 @@ data_exchange:
goto exit; goto exit;
} }
if( ( buf = mbedtls_calloc( 1, len ) ) == NULL ) if( ( context_buf = mbedtls_calloc( 1, buf_len ) ) == NULL )
{ {
mbedtls_printf( " failed\n ! Couldn't allocate buffer for " mbedtls_printf( " failed\n ! Couldn't allocate buffer for "
"serialized context" ); "serialized context" );
@ -3958,7 +3958,7 @@ data_exchange:
goto exit; goto exit;
} }
if( ( ret = mbedtls_ssl_context_save( &ssl, buf, len, &len ) ) != 0 ) if( ( ret = mbedtls_ssl_context_save( &ssl, context_buf, buf_len, &buf_len ) ) != 0 )
{ {
mbedtls_printf( "failed\n ! mbedtls_ssl_context_save returned " mbedtls_printf( "failed\n ! mbedtls_ssl_context_save returned "
"-0x%x\n\n", -ret ); "-0x%x\n\n", -ret );
@ -3989,7 +3989,7 @@ data_exchange:
mbedtls_printf( " Deserializing connection..." ); mbedtls_printf( " Deserializing connection..." );
if( ( ret = mbedtls_ssl_context_load( &ssl, buf, len ) ) != 0 ) if( ( ret = mbedtls_ssl_context_load( &ssl, context_buf, buf_len ) ) != 0 )
{ {
mbedtls_printf( "failed\n ! mbedtls_ssl_context_load returned " mbedtls_printf( "failed\n ! mbedtls_ssl_context_load returned "
"-0x%x\n\n", -ret ); "-0x%x\n\n", -ret );