yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 12:45:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added explicit casts to prevent compiler warnings when trying to build for iOS

Browse Source
This commit is contained in:
Sander Niemeijer 2014-08-16 12:45:52 +02:00 committed by Manuel Pégourié-Gonnard
parent 8ef7088bb9
commit ef5087d150
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -16,6 +16,7 @@ Bugfix
write callback returned WANT_WRITE when requesting renegotiation. write callback returned WANT_WRITE when requesting renegotiation.
* ssl_close_notify() could send more than one message in some circumstances * ssl_close_notify() could send more than one message in some circumstances
with non-blocking I/O. with non-blocking I/O.
* Fix compiler warnings on iOS (found by Sander Niemeijer).
Changes Changes
* Ciphersuites using SHA-256 or SHA-384 now require TLS 1.x (there is no * Ciphersuites using SHA-256 or SHA-384 now require TLS 1.x (there is no

4
include/polarssl/bn_mul.h
View File

@ -833,8 +833,8 @@
#define MULADDC_CORE \ #define MULADDC_CORE \
r = *(s++) * (t_udbl) b; \ r = *(s++) * (t_udbl) b; \
r0 = r; \ r0 = (t_uint) r; \
r1 = r >> biL; \ r1 = (t_uint)( r >> biL ); \
r0 += c; r1 += (r0 < c); \ r0 += c; r1 += (r0 < c); \
r0 += *d; r1 += (r0 < *d); \ r0 += *d; r1 += (r0 < *d); \
c = r1; *(d++) = r0; c = r1; *(d++) = r0;

9
library/net.c
View File

@ -497,7 +497,12 @@ void net_usleep( unsigned long usec )
{ {
struct timeval tv; struct timeval tv;
tv.tv_sec = 0; tv.tv_sec = 0;
#if !defined(_WIN32) && (defined(__unix__) || defined(__unix) || \
(defined(__APPLE__) && defined(__MACH__)))
tv.tv_usec = (suseconds_t) usec;
#else
tv.tv_usec = usec; tv.tv_usec = usec;
#endif
select( 0, NULL, NULL, NULL, &tv ); select( 0, NULL, NULL, NULL, &tv );
} }
#endif /* POLARSSL_HAVE_TIME */ #endif /* POLARSSL_HAVE_TIME */
@ -508,7 +513,7 @@ void net_usleep( unsigned long usec )
int net_recv( void *ctx, unsigned char *buf, size_t len ) int net_recv( void *ctx, unsigned char *buf, size_t len )
{ {
int fd = *((int *) ctx); int fd = *((int *) ctx);
int ret = read( fd, buf, len ); int ret = (int) read( fd, buf, len );
if( ret < 0 ) if( ret < 0 )
{ {
@ -539,7 +544,7 @@ int net_recv( void *ctx, unsigned char *buf, size_t len )
int net_send( void *ctx, const unsigned char *buf, size_t len ) int net_send( void *ctx, const unsigned char *buf, size_t len )
{ {
int fd = *((int *) ctx); int fd = *((int *) ctx);
int ret = write( fd, buf, len ); int ret = (int) write( fd, buf, len );
if( ret < 0 ) if( ret < 0 )
{ {

2
library/pk.c
View File

@ -222,7 +222,7 @@ int pk_verify_ext( pk_type_t type, const void *options,
ret = rsa_rsassa_pss_verify_ext( pk_rsa( *ctx ), ret = rsa_rsassa_pss_verify_ext( pk_rsa( *ctx ),
NULL, NULL, RSA_PUBLIC, NULL, NULL, RSA_PUBLIC,
md_alg, hash_len, hash, md_alg, (unsigned int) hash_len, hash,
pss_opts->mgf1_hash_id, pss_opts->mgf1_hash_id,
pss_opts->expected_salt_len, pss_opts->expected_salt_len,
sig ); sig );

4
library/timing.c
View File

@ -379,7 +379,7 @@ int timing_self_test( int verbose )
{ {
(void) get_timer( &hires, 1 ); (void) get_timer( &hires, 1 );
m_sleep( 500 * secs ); m_sleep( (int)( 500 * secs ) );
millisecs = get_timer( &hires, 0 ); millisecs = get_timer( &hires, 0 );
@ -402,7 +402,7 @@ int timing_self_test( int verbose )
{ {
(void) get_timer( &hires, 1 ); (void) get_timer( &hires, 1 );
set_alarm( secs ); set_alarm( (int) secs );
while( !alarmed ) while( !alarmed )
; ;

2
library/x509.c
View File

@ -876,7 +876,7 @@ int x509_sig_alg_gets( char *buf, size_t size, const x509_buf *sig_oid,
((void) sig_opts); ((void) sig_opts);
#endif /* POLARSSL_X509_RSASSA_PSS_SUPPORT */ #endif /* POLARSSL_X509_RSASSA_PSS_SUPPORT */
return( (int) size - n ); return( (int)( size - n ) );
} }
/* /*