Commit 8164032a authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix warnings: computed value not use, incompatible pointer initialization 

and cast from pointer to int of different size (linux-x86_64 and align).
parent a5804a75

ssl/s3_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ void ssl3_init_finished_mac(SSL *s) 
	if (s->s3->handshake_buffer) BIO_free(s->s3->handshake_buffer);

	if (s->s3->handshake_dgst) ssl3_free_digest_list(s);

    s->s3->handshake_buffer=BIO_new(BIO_s_mem());	

	BIO_set_close(s->s3->handshake_buffer,BIO_CLOSE);

	(void)BIO_set_close(s->s3->handshake_buffer,BIO_CLOSE);

	}



void ssl3_free_digest_list(SSL *s)

ssl/s3_pkt.c

+7 −5
Original line number Diff line number Diff line
@@ -129,7 +129,8 @@ int ssl3_read_n(SSL *s, int n, int max, int extend) 
	 * (If s->read_ahead is set, 'max' bytes may be stored in rbuf

	 * [plus s->packet_length bytes if extend == 1].)

	 */

	int i,len,left,align=0;

	int i,len,left;

	long align=0;

	unsigned char *pkt;

	SSL3_BUFFER *rb;
@@ -138,7 +139,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend) 
	rb    = &(s->s3->rbuf);

	left  = rb->left;

#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0

	align = (int)rb->buf + SSL3_RT_HEADER_LENGTH;

	align = (long)rb->buf + SSL3_RT_HEADER_LENGTH;

	align = (-align)&(SSL3_ALIGN_PAYLOAD-1);

#endif
@@ -602,7 +603,8 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, 
	{

	unsigned char *p,*plen;

	int i,mac_size,clear=0;

	int prefix_len=0,align=0;

	int prefix_len=0;

	long align=0;

	SSL3_RECORD *wr;

	SSL3_BUFFER *wb=&(s->s3->wbuf);

	SSL_SESSION *sess;
@@ -672,7 +674,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, 
		 * which would be multiple of SSL3_ALIGN_PAYLOAD, so

		 * if we want to align the real payload, then we can

		 * just pretent we simply have two headers. */

		align = (int)wb->buf + 2*SSL3_RT_HEADER_LENGTH;

		align = (long)wb->buf + 2*SSL3_RT_HEADER_LENGTH;

		align = (-align)&(SSL3_ALIGN_PAYLOAD-1);

#endif

		p = wb->buf + align;
@@ -685,7 +687,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, 
	else

		{

#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0

		align = (int)wb->buf + SSL3_RT_HEADER_LENGTH;

		align = (long)wb->buf + SSL3_RT_HEADER_LENGTH;

		align = (-align)&(SSL3_ALIGN_PAYLOAD-1);

#endif

		p = wb->buf + align;

ssl/ssl_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ SSL3_ENC_METHOD ssl3_undef_enc_method={ 
	(int (*)(SSL*, int))ssl_undefined_function,

	(int (*)(SSL *,  const char*, int, unsigned char *))ssl_undefined_function,

	0,	/* finish_mac_length */

	(int (*)(SSL *, const EVP_MD *, unsigned char *))ssl_undefined_function,

	(int (*)(SSL *, int, unsigned char *))ssl_undefined_function,

	NULL,	/* client_finished_label */

	0,	/* client_finished_label_len */

	NULL,	/* server_finished_label */