From 20a90e3a76135c34b4988ba3cc2835603d98639a Mon Sep 17 00:00:00 2001
From: Geoff Thorpe <geoff@openssl.org>
Date: Fri, 22 Jul 2005 03:36:30 +0000
Subject: [PATCH] Fix some signed/unsigned warnings.
---
crypto/rand/rand_unix.c | 9 ++++++---
ssl/d1_clnt.c | 2 +-
ssl/d1_srvr.c | 3 ++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index 14837a7a7d..c340642515 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -155,7 +155,8 @@ int RAND_poll(void)
#ifdef DEVRANDOM
static const char *randomfiles[] = { DEVRANDOM };
struct stat randomstats[sizeof(randomfiles)/sizeof(randomfiles[0])];
- int fd,i;
+ int fd;
+ unsigned int i;
#endif
#ifdef DEVRANDOM_EGD
static const char *egdsockets[] = { DEVRANDOM_EGD, NULL };
@@ -168,7 +169,8 @@ int RAND_poll(void)
* have this. Use /dev/urandom if you can as /dev/random may block
* if it runs out of random entries. */
- for (i=0; i<sizeof(randomfiles)/sizeof(randomfiles[0]) && n < ENTROPY_NEEDED; i++)
+ for (i = 0; (i < sizeof(randomfiles)/sizeof(randomfiles[0])) &&
+ (n < ENTROPY_NEEDED); i++)
{
if ((fd = open(randomfiles[i], O_RDONLY
#ifdef O_NONBLOCK
@@ -185,7 +187,8 @@ int RAND_poll(void)
{
struct timeval t = { 0, 10*1000 }; /* Spend 10ms on
each file. */
- int r,j;
+ int r;
+ unsigned int j;
fd_set fset;
struct stat *st=&randomstats[i];
diff --git a/ssl/d1_clnt.c b/ssl/d1_clnt.c
index c0247faa98..deeb50da3d 100644
--- a/ssl/d1_clnt.c
+++ b/ssl/d1_clnt.c
@@ -541,7 +541,7 @@ int dtls1_client_hello(SSL *s)
{
unsigned char *buf;
unsigned char *p,*d;
- int i,j;
+ unsigned int i,j;
unsigned long Time,l;
SSL_COMP *comp;
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c
index 2d41b38ca6..8865dd2a4e 100644
--- a/ssl/d1_srvr.c
+++ b/ssl/d1_srvr.c
@@ -677,7 +677,8 @@ int dtls1_send_server_hello(SSL *s)
{
unsigned char *buf;
unsigned char *p,*d;
- int i,sl;
+ int i;
+ unsigned int sl;
unsigned long l,Time;
if (s->state == SSL3_ST_SW_SRVR_HELLO_A)