Commit ef5087d1 authored by Sander Niemeijer's avatar Sander Niemeijer Committed by Manuel Pégourié-Gonnard
Browse files

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

parent 8ef7088b
......@@ -16,6 +16,7 @@ Bugfix
write callback returned WANT_WRITE when requesting renegotiation.
* ssl_close_notify() could send more than one message in some circumstances
with non-blocking I/O.
* Fix compiler warnings on iOS (found by Sander Niemeijer).
Changes
* Ciphersuites using SHA-256 or SHA-384 now require TLS 1.x (there is no
......
......@@ -833,8 +833,8 @@
#define MULADDC_CORE \
r = *(s++) * (t_udbl) b; \
r0 = r; \
r1 = r >> biL; \
r0 = (t_uint) r; \
r1 = (t_uint)( r >> biL ); \
r0 += c; r1 += (r0 < c); \
r0 += *d; r1 += (r0 < *d); \
c = r1; *(d++) = r0;
......
......@@ -497,7 +497,12 @@ void net_usleep( unsigned long usec )
{
struct timeval tv;
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;
#endif
select( 0, NULL, NULL, NULL, &tv );
}
#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 fd = *((int *) ctx);
int ret = read( fd, buf, len );
int ret = (int) read( fd, buf, len );
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 fd = *((int *) ctx);
int ret = write( fd, buf, len );
int ret = (int) write( fd, buf, len );
if( ret < 0 )
{
......
......@@ -222,7 +222,7 @@ int pk_verify_ext( pk_type_t type, const void *options,
ret = rsa_rsassa_pss_verify_ext( pk_rsa( *ctx ),
NULL, NULL, RSA_PUBLIC,
md_alg, hash_len, hash,
md_alg, (unsigned int) hash_len, hash,
pss_opts->mgf1_hash_id,
pss_opts->expected_salt_len,
sig );
......
......@@ -379,7 +379,7 @@ int timing_self_test( int verbose )
{
(void) get_timer( &hires, 1 );
m_sleep( 500 * secs );
m_sleep( (int)( 500 * secs ) );
millisecs = get_timer( &hires, 0 );
......@@ -402,7 +402,7 @@ int timing_self_test( int verbose )
{
(void) get_timer( &hires, 1 );
set_alarm( secs );
set_alarm( (int) secs );
while( !alarmed )
;
......
......@@ -876,7 +876,7 @@ int x509_sig_alg_gets( char *buf, size_t size, const x509_buf *sig_oid,
((void) sig_opts);
#endif /* POLARSSL_X509_RSASSA_PSS_SUPPORT */
return( (int) size - n );
return( (int)( size - n ) );
}
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment