diff options
| author | Felix Laurie von Massenbach <felix@erbridge.co.uk> | 2014-06-15 11:58:33 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-06-17 18:38:36 +0100 |
| commit | 1b823494de950f54d36681c2ab1ee28949f69328 (patch) | |
| tree | b4bba5390b9b180f33e254db73a3399bbe07ab46 /ssl | |
| parent | 6657e68bf25cfa9648442b59c5b9ea5683e190ab (diff) | |
Fix signed/unsigned comparisons.
(cherry picked from commit 50cc4f7b3d64621b6062ad1f16a7630b7c730d9b)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_pkt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index fe46cb0b88..d7293ccd8a 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -657,7 +657,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) * compromise is considered worthy. */ 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 && SSL_USE_EXPLICIT_IV(s) && EVP_CIPHER_flags(s->enc_write_ctx->cipher)&EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK) @@ -678,7 +678,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) EVP_CTRL_TLS1_1_MULTIBLOCK_MAX_BUFSIZE, max_send_fragment,NULL); - if (len>=8*max_send_fragment) packlen *= 8; + if (len>=8*(int)max_send_fragment) packlen *= 8; else packlen *= 4; wb->buf=OPENSSL_malloc(packlen); @@ -730,7 +730,7 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) EVP_CTRL_TLS1_1_MULTIBLOCK_AAD, 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 */ wb->buf = NULL; |