Commit 4e321ffa authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fixes for signed/unsigned warnings and shadows.

parent 6ededa42

apps/s_apps.h

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ typedef fd_mask fd_set; 
#define PORT_STR        "4433"

#define PROTOCOL        "tcp"



int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), char *context);

int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, unsigned char *context), unsigned char *context);

#ifdef HEADER_X509_H

int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);

#endif

apps/s_client.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ int MAIN(int argc, char **argv) 
#endif



	struct sockaddr peer;

	int peerlen = sizeof(peer);

	socklen_t peerlen = sizeof(peer);

	int enable_timeouts = 0 ;

	long mtu = 0;

apps/s_server.c

+2 −2
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ int MAIN(int argc, char *argv[]) 
	int vflags = 0;

	short port=PORT;

	char *CApath=NULL,*CAfile=NULL;

	char *context = NULL;

	unsigned char *context = NULL;

	char *dhfile = NULL;

	char *named_curve = NULL;

	int badop=0,bugs=0;
@@ -604,7 +604,7 @@ int MAIN(int argc, char *argv[]) 
		else if	(strcmp(*argv,"-context") == 0)

			{

			if (--argc < 1) goto bad;

			context= *(++argv);

			context= (unsigned char *)*(++argv);

			}

		else if	(strcmp(*argv,"-cert") == 0)

			{

apps/s_socket.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port, int type) 
	return(1);

	}



int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), char *context)

int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, unsigned char *context), unsigned char *context)

	{

	int sock;

	char *name = NULL;

ssl/d1_both.c

+4 −4
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ int dtls1_do_write(SSL *s, int type) 
			dtls1_fix_message_header(s, frag_off, 

				len - DTLS1_HM_HEADER_LENGTH);



			dtls1_write_message_header(s, &s->init_buf->data[s->init_off]);

			dtls1_write_message_header(s, (unsigned char *)&s->init_buf->data[s->init_off]);



			OPENSSL_assert(len >= DTLS1_HM_HEADER_LENGTH);

			}
@@ -472,7 +472,7 @@ dtls1_process_handshake_fragment(SSL *s, int frag_len) 
    {

    unsigned char *p;



    p = s->init_buf->data;

    p = (unsigned char *)s->init_buf->data;



	ssl3_finish_mac(s, &p[s->init_num - frag_len], frag_len);

    }
@@ -492,7 +492,7 @@ dtls1_process_out_of_seq_message(SSL *s, struct hm_header_st *msg_hdr, int *ok) 
        goto err;

        }



    p = s->init_buf->data;

    p = (unsigned char *)s->init_buf->data;



    /* read the body of the fragment (header has already been read */

    if ( msg_hdr->frag_len > 0)
@@ -666,7 +666,7 @@ dtls1_get_message_fragment(SSL *s, int st1, int stn, long max, int *ok) 
	s->state=stn;

	

	/* next state (stn) */

	p = s->init_buf->data;

	p = (unsigned char *)s->init_buf->data;



	if ( frag_len > 0)

		{