diff --git a/ChangeLog b/ChangeLog index cf3640567..c72ee5d45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h index 64b59ff1e..a8f0d22a0 100644 --- a/include/polarssl/bn_mul.h +++ b/include/polarssl/bn_mul.h @@ -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; diff --git a/library/net.c b/library/net.c index de1ec7502..ec5680055 100644 --- a/library/net.c +++ b/library/net.c @@ -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 ) { diff --git a/library/pk.c b/library/pk.c index 11faf3c8d..4aba3aa6d 100644 --- a/library/pk.c +++ b/library/pk.c @@ -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 ); diff --git a/library/timing.c b/library/timing.c index 94be0add0..b387bd87f 100644 --- a/library/timing.c +++ b/library/timing.c @@ -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 ) ; diff --git a/library/x509.c b/library/x509.c index 13081e35d..49f7672f1 100644 --- a/library/x509.c +++ b/library/x509.c @@ -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 ) ); } /*