More VC++ pickiness. (destest.c doesn't have a "return" and the usual

signed/unsigned stuff in s3_pkt.c)

Submitted by:
Reviewed by:
PR:

diff --git a/crypto/des/destest.c b/crypto/des/destest.c
index 46c517be135c78df80c3a1f71094311d27d17532..98f373008f5eb1795d4d460ca0bdcf70eb1f4420 100644 (file)
--- a/crypto/des/destest.c
+++ b/crypto/des/destest.c
@@ -796,6 +796,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                }
        printf("\n");
        exit(err);
                }
        printf("\n");
        exit(err);

+       return(err); /* Never reached, but keeps compilers happy */

        }
 
 static char *pt(unsigned char *p)
        }
 
 static char *pt(unsigned char *p)

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 579058e0f22ec9862d79f75d422c863d93a80f07..6d9dad9040208606ef1ea298641828cb373d3171 100644 (file)
--- 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 ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len)
        {

-       int al,i,j,ret;
-       unsigned int n;
+       int al,j,ret;
+       unsigned int i,n;

        SSL3_RECORD *rr;
        void (*cb)()=NULL;
 
        SSL3_RECORD *rr;
        void (*cb)()=NULL;