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

Fix signed/unsigned comparisons.

Browse Source
This commit is contained in:
Felix Laurie von Massenbach
2014-06-15 11:58:33 +01:00
committed by Dr. Stephen Henson
parent 1f61d8b5b1
commit 50cc4f7b3d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/evp/e_aes_cbc_hmac_sha256.c
View File

@@ -774,7 +774,7 @@ static int aesni_cbc_hmac_sha256_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, vo
unsigned int n4x=1, x4; unsigned int n4x=1, x4;
unsigned int frag, last, packlen, inp_len; unsigned int frag, last, packlen, inp_len;
if (arg<sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM)) return -1; if (arg<(int)sizeof(EVP_CTRL_TLS1_1_MULTIBLOCK_PARAM)) return -1;
inp_len = param->inp[11]<<8|param->inp[12]; inp_len = param->inp[11]<<8|param->inp[12];

6
ssl/s3_pkt.c
View File

@@ -696,7 +696,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
* compromise is considered worthy. * compromise is considered worthy.
*/ */
if (type==SSL3_RT_APPLICATION_DATA && if (type==SSL3_RT_APPLICATION_DATA &&
len >= 4*(max_send_fragment=s->max_send_fragment) && len >= 4*(int)(max_send_fragment=s->max_send_fragment) &&
s->compress==NULL && s->msg_callback==NULL && s->compress==NULL && s->msg_callback==NULL &&
!SSL_USE_ETM(s) && SSL_USE_EXPLICIT_IV(s) && !SSL_USE_ETM(s) && SSL_USE_EXPLICIT_IV(s) &&
EVP_CIPHER_flags(s->enc_write_ctx->cipher)&EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) EVP_CIPHER_flags(s->enc_write_ctx->cipher)&EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK)
@@ -717,7 +717,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE, EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE,
max_send_fragment,NULL); max_send_fragment,NULL);
if (len>=8*max_send_fragment) packlen *= 8; if (len>=8*(int)max_send_fragment) packlen *= 8;
else packlen *= 4; else packlen *= 4;
wb->buf=OPENSSL_malloc(packlen); wb->buf=OPENSSL_malloc(packlen);
@@ -769,7 +769,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len)
EVP_CTRL_TLS1_1_MULTIBLOCK_AAD, EVP_CTRL_TLS1_1_MULTIBLOCK_AAD,
sizeof(mb_param),&mb_param); sizeof(mb_param),&mb_param);
if (packlen<=0 || packlen>wb->len) /* never happens */ if (packlen<=0 || packlen>(int)wb->len) /* never happens */
{ {
OPENSSL_free(wb->buf); /* free jumbo buffer */ OPENSSL_free(wb->buf); /* free jumbo buffer */
wb->buf = NULL; wb->buf = NULL;