diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2005-04-26 17:43:53 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2005-04-26 17:43:53 +0000 |
commit | 4e321ffafff3a1f31bbbfdcf1b17c0ecbde2121f (patch) | |
tree | 7d73e26943039afac7437af0bd9d49185468d80c /ssl | |
parent | 6ededa42db8b4c222fa95198d43c1ad57c19b411 (diff) |
Fixes for signed/unsigned warnings and shadows.
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/d1_both.c | 8 | ||||
-rw-r--r-- | ssl/d1_pkt.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c index 68908810bd..fb98bf49d0 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c @@ -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) { diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index 4b3aabcfa7..c84e6865a0 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c @@ -775,7 +775,7 @@ start: * fill that so that we can process the data at a fixed place. */ { - unsigned int i, dest_maxlen = 0; + unsigned int k, dest_maxlen = 0; unsigned char *dest = NULL; unsigned int *dest_len = NULL; @@ -807,9 +807,9 @@ start: } /* now move 'n' bytes: */ - for ( i = 0; i < dest_maxlen; i++) + for ( k = 0; k < dest_maxlen; k++) { - dest[i] = rr->data[rr->off++]; + dest[k] = rr->data[rr->off++]; rr->length--; } *dest_len = dest_maxlen; @@ -1504,8 +1504,8 @@ int dtls1_dispatch_alert(SSL *s) { int i,j; void (*cb)(const SSL *ssl,int type,int val)=NULL; - char buf[2 + 2 + 3]; /* alert level + alert desc + message seq +frag_off */ - char *ptr = &buf[0]; + unsigned char buf[2 + 2 + 3]; /* alert level + alert desc + message seq +frag_off */ + unsigned char *ptr = &buf[0]; s->s3->alert_dispatch=0; |