wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix casts

Browse source
This commit is contained in:
Bodo Möller 2002-05-05 23:01:42 +00:00
parent 3d24c18200
commit ea9e248cde
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ssl/s3_pkt.c
View file

@ -236,7 +236,8 @@ static int ssl3_get_record(SSL *s)
unsigned char md[EVP_MAX_MD_SIZE]; unsigned char md[EVP_MAX_MD_SIZE];
short version; short version;
unsigned int mac_size; unsigned int mac_size;
int clear=0,extra; int clear=0;
size_t extra;
rr= &(s->s3->rrec); rr= &(s->s3->rrec);
sess=s->session; sess=s->session;
@ -245,7 +246,7 @@ static int ssl3_get_record(SSL *s)
extra=SSL3_RT_MAX_EXTRA; extra=SSL3_RT_MAX_EXTRA;
else else
extra=0; extra=0;
if (extra != (int)(s->s3->rbuf_len - SSL3_RT_MAX_PACKET_SIZE)) if (extra != s->s3->rbuf_len - SSL3_RT_MAX_PACKET_SIZE)
{ {
/* actually likely an application error: SLS_OP_MICROSOFT_BIG_SSLV3_BUFFER /* actually likely an application error: SLS_OP_MICROSOFT_BIG_SSLV3_BUFFER
* set after ssl3_setup_buffers() was done */ * set after ssl3_setup_buffers() was done */
@ -295,8 +296,7 @@ again:
goto err; goto err;
} }
if (rr->length > if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH+extra)
(unsigned int)SSL3_RT_MAX_ENCRYPTED_LENGTH+extra)
{ {
al=SSL_AD_RECORD_OVERFLOW; al=SSL_AD_RECORD_OVERFLOW;
SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_PACKET_LENGTH_TOO_LONG); SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_PACKET_LENGTH_TOO_LONG);
@ -308,7 +308,7 @@ again:
/* s->rstate == SSL_ST_READ_BODY, get and decode the data */ /* s->rstate == SSL_ST_READ_BODY, get and decode the data */
if (rr->length > (s->packet_length-SSL3_RT_HEADER_LENGTH)) if (rr->length > s->packet_length-SSL3_RT_HEADER_LENGTH)
{ {
/* now s->packet_length == SSL3_RT_HEADER_LENGTH */ /* now s->packet_length == SSL3_RT_HEADER_LENGTH */
i=rr->length; i=rr->length;
@ -336,7 +336,7 @@ again:
* rr->length bytes of encrypted compressed stuff. */ * rr->length bytes of encrypted compressed stuff. */
/* check is not needed I believe */ /* check is not needed I believe */
if (rr->length > (unsigned int)SSL3_RT_MAX_ENCRYPTED_LENGTH+extra) if (rr->length > SSL3_RT_MAX_ENCRYPTED_LENGTH+extra)
{ {
al=SSL_AD_RECORD_OVERFLOW; al=SSL_AD_RECORD_OVERFLOW;
SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_ENCRYPTED_LENGTH_TOO_LONG); SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_ENCRYPTED_LENGTH_TOO_LONG);
@ -405,8 +405,7 @@ printf("\n");
/* r->length is now just compressed */ /* r->length is now just compressed */
if (s->expand != NULL) if (s->expand != NULL)
{ {
if (rr->length > if (rr->length > SSL3_RT_MAX_COMPRESSED_LENGTH+extra)
(unsigned int)SSL3_RT_MAX_COMPRESSED_LENGTH+extra)
{ {
al=SSL_AD_RECORD_OVERFLOW; al=SSL_AD_RECORD_OVERFLOW;
SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_COMPRESSED_LENGTH_TOO_LONG); SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_COMPRESSED_LENGTH_TOO_LONG);
@ -420,7 +419,7 @@ printf("\n");
} }
} }
if (rr->length > (unsigned int)SSL3_RT_MAX_PLAIN_LENGTH+extra) if (rr->length > SSL3_RT_MAX_PLAIN_LENGTH+extra)
{ {
al=SSL_AD_RECORD_OVERFLOW; al=SSL_AD_RECORD_OVERFLOW;
SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_DATA_LENGTH_TOO_LONG); SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_DATA_LENGTH_TOO_LONG);
@ -605,7 +604,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
if (prefix_len <= 0) if (prefix_len <= 0)
goto err; goto err;
if (s->s3->wbuf_len < (unsigned int)(prefix_len + SSL3_RT_MAX_PACKET_SIZE)) if (s->s3->wbuf_len < prefix_len + SSL3_RT_MAX_PACKET_SIZE)
{ {
/* insufficient space */ /* insufficient space */
SSLerr(SSL_F_DO_SSL3_WRITE, SSL_R_INTERNAL_ERROR); SSLerr(SSL_F_DO_SSL3_WRITE, SSL_R_INTERNAL_ERROR);