From: Nikos Mavrogiannopoulos Date: Fri, 28 Sep 2012 11:14:31 +0000 (+0200) Subject: Corrected signed-to-unsigned comparisons X-Git-Tag: gnutls_3_1_3~81 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80e3fa56f4f99008b523491f4d758de7a68ff777;p=thirdparty%2Fgnutls.git Corrected signed-to-unsigned comparisons --- diff --git a/lib/ext/max_record.c b/lib/ext/max_record.c index 002c306d8c..9e2c42311b 100644 --- a/lib/ext/max_record.c +++ b/lib/ext/max_record.c @@ -118,7 +118,7 @@ _gnutls_max_record_recv_params (gnutls_session_t session, new_size = _gnutls_mre_num2record (data[0]); - if (new_size < 0 || new_size != epriv.num) + if (new_size < 0 || new_size != (ssize_t)epriv.num) { gnutls_assert (); return GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER; diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c index 30db0336ed..3c5ba7057b 100644 --- a/lib/gnutls_buffers.c +++ b/lib/gnutls_buffers.c @@ -1057,7 +1057,7 @@ _gnutls_parse_record_buffered_msgs (gnutls_session_t session) /* this is the rest of a previous message */ if (session->internals.handshake_recv_buffer_size > 0 && recv_buf[0].length > 0 && remain > 0) { - if (msg.size <= remain) + if ((ssize_t)msg.size <= remain) append = msg.size; else append = remain; diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h index 29b7f7b38f..806f3e3d34 100644 --- a/lib/gnutls_int.h +++ b/lib/gnutls_int.h @@ -905,7 +905,7 @@ typedef struct unsigned int cb_tls_unique_len; unsigned char cb_tls_unique[MAX_VERIFY_DATA_SIZE]; - unsigned int handshake_endtime; /* end time in seconds */ + time_t handshake_endtime; /* end time in seconds */ unsigned int handshake_timeout_ms; /* timeout in milliseconds */ gnutls_buffer_st hb_local_data; diff --git a/lib/nettle/wmnaf.c b/lib/nettle/wmnaf.c index b7eb092f68..f6b03b62e8 100644 --- a/lib/nettle/wmnaf.c +++ b/lib/nettle/wmnaf.c @@ -50,7 +50,7 @@ mpz_unitstbit (mpz_t u, mp_bitcnt_t bit_index) { mp_srcptr u_ptr = u->_mp_d; mp_size_t size = u->_mp_size; - unsigned abs_size = ABS (size); + mp_size_t abs_size = ABS (size); mp_size_t limb_index = bit_index / GMP_NUMB_BITS; mp_srcptr p = u_ptr + limb_index; mp_limb_t limb;