generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix warnings: computed value not use, incompatible pointer initialization

Browse Source 
and cast from pointer to int of different size (linux-x86_64 and align).
This commit is contained in:
Dr. Stephen Henson 2007-09-07 13:03:25 +00:00
parent a5804a750b
commit 8164032a2e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/s3_enc.c
View File

@ -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_buffer) BIO_free(s->s3->handshake_buffer);
if (s->s3->handshake_dgst) ssl3_free_digest_list(s); if (s->s3->handshake_dgst) ssl3_free_digest_list(s);
s->s3->handshake_buffer=BIO_new(BIO_s_mem()); 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) void ssl3_free_digest_list(SSL *s)

12
ssl/s3_pkt.c
View File

@ -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 * (If s->read_ahead is set, 'max' bytes may be stored in rbuf
* [plus s->packet_length bytes if extend == 1].) * [plus s->packet_length bytes if extend == 1].)
*/ */
int i,len,left,align=0; int i,len,left;
long align=0;
unsigned char *pkt; unsigned char *pkt;
SSL3_BUFFER *rb; SSL3_BUFFER *rb;
@ -138,7 +139,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
rb = &(s->s3->rbuf); rb = &(s->s3->rbuf);
left = rb->left; left = rb->left;
#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0 #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); align = (-align)&(SSL3_ALIGN_PAYLOAD-1);
#endif #endif
@ -602,7 +603,8 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
{ {
unsigned char *p,*plen; unsigned char *p,*plen;
int i,mac_size,clear=0; int i,mac_size,clear=0;
int prefix_len=0,align=0; int prefix_len=0;
long align=0;
SSL3_RECORD *wr; SSL3_RECORD *wr;
SSL3_BUFFER *wb=&(s->s3->wbuf); SSL3_BUFFER *wb=&(s->s3->wbuf);
SSL_SESSION *sess; 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 * which would be multiple of SSL3_ALIGN_PAYLOAD, so
* if we want to align the real payload, then we can * if we want to align the real payload, then we can
* just pretent we simply have two headers. */ * 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); align = (-align)&(SSL3_ALIGN_PAYLOAD-1);
#endif #endif
p = wb->buf + align; p = wb->buf + align;
@ -685,7 +687,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
else else
{ {
#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0 #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); align = (-align)&(SSL3_ALIGN_PAYLOAD-1);
#endif #endif
p = wb->buf + align; p = wb->buf + align;

2
ssl/ssl_lib.c
View File

@ -167,7 +167,7 @@ SSL3_ENC_METHOD ssl3_undef_enc_method={
(int (*)(SSL*, int))ssl_undefined_function, (int (*)(SSL*, int))ssl_undefined_function,
(int (*)(SSL *, const char*, int, unsigned char *))ssl_undefined_function, (int (*)(SSL *, const char*, int, unsigned char *))ssl_undefined_function,
0, /* finish_mac_length */ 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 */ NULL, /* client_finished_label */
0, /* client_finished_label_len */ 0, /* client_finished_label_len */
NULL, /* server_finished_label */ NULL, /* server_finished_label */