mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings properly this time ;-)

Browse Source
This commit is contained in:
Dr. Stephen Henson 2009-01-11 20:34:23 +00:00
parent 41b7619596
commit d7ecd42255
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/s2_pkt.c
View File

@ -130,7 +130,7 @@ static int ssl2_read_internal(SSL *s, void *buf, int len, int peek)
unsigned char mac[MAX_MAC_SIZE];
unsigned char *p;
int i;
unsigned int mac_size;
int mac_size;
ssl2_read_again:
if (SSL_in_init(s) && !s->in_handshake)
@ -263,7 +263,7 @@ static int ssl2_read_internal(SSL *s, void *buf, int len, int peek)
/* added a check for length > max_size in case
* encryption was not turned on yet due to an error */
if ((!s->s2->clear_text) &&
(s->s2->rlength >= mac_size))
(s->s2->rlength >= (unsigned int)mac_size))
{
ssl2_enc(s,0);
s->s2->ract_data_length-=mac_size;

6
ssl/t1_enc.c
View File

@ -805,8 +805,8 @@ int tls1_final_finish_mac(SSL *s,
{
if (mask & s->s3->tmp.new_cipher->algorithm2)
{
unsigned int hashsize = EVP_MD_size(md);
if (hashsize < 0 || hashsize > (sizeof buf - (size_t)(q-buf)))
int hashsize = EVP_MD_size(md);
if (hashsize < 0 || hashsize > (int)(sizeof buf - (size_t)(q-buf)))
{
/* internal error: 'buf' is too small for this cipersuite! */
err = 1;
@ -815,7 +815,7 @@ int tls1_final_finish_mac(SSL *s,
{
EVP_MD_CTX_copy_ex(&ctx,s->s3->handshake_dgst[idx]);
EVP_DigestFinal_ex(&ctx,q,&i);
if (i != hashsize) /* can't really happen */
if (i != (unsigned int)hashsize) /* can't really happen */
err = 1;
q+=i;
}