From: Bodo Möller <bodo@openssl.org>
Date: Fri, 25 Feb 2000 15:32:36 +0000 (+0000)
Subject: The previous revision should have generated _more_ warnings, not less ...
X-Git-Tag: OpenSSL_0_9_5beta2~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b08b07b8ae6c216390727ee6b39afc79c6589973;p=openssl

The previous revision should have generated _more_ warnings, not less ...
The return value of handshake_func is signed, not unsigned.
---

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 6d9dad9040..a407c9d741 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -706,8 +706,8 @@ static int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
  */
 int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len)
 	{
-	int al,j,ret;
-	unsigned int i,n;
+	int al,i,j,ret;
+	unsigned int n;
 	SSL3_RECORD *rr;
 	void (*cb)()=NULL;
 
@@ -890,9 +890,9 @@ start:
 			ssl3_renegotiate(s);
 			if (ssl3_renegotiate_check(s))
 				{
-				n=s->handshake_func(s);
-				if (n < 0) return(n);
-				if (n == 0)
+				i=s->handshake_func(s);
+				if (i < 0) return(i);
+				if (i == 0)
 					{
 					SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
 					return(-1);