The previous revision should have generated _more_ warnings, not less ...
[openssl.git] / ssl / s3_pkt.c
index 6d9dad9..a407c9d 100644 (file)
@@ -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 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;
 
        SSL3_RECORD *rr;
        void (*cb)()=NULL;
 
@@ -890,9 +890,9 @@ start:
                        ssl3_renegotiate(s);
                        if (ssl3_renegotiate_check(s))
                                {
                        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);
                                        {
                                        SSLerr(SSL_F_SSL3_READ_BYTES,SSL_R_SSL_HANDSHAKE_FAILURE);
                                        return(-1);