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 17:41:46 +0100 |
| commit | 50cc4f7b3d64621b6062ad1f16a7630b7c730d9b (patch) | |
| tree | 886feb9bb83a09c79c0e18e5b945dbb0bb9dc5a0 /ssl/s3_pkt.c | |
| parent | 1f61d8b5b1bda282015236fe9860d2f6de127356 (diff) | |
| download | openssl-50cc4f7b3d64621b6062ad1f16a7630b7c730d9b.tar.gz | |
Fix signed/unsigned comparisons.
Diffstat (limited to 'ssl/s3_pkt.c')
| -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 02302a5dbf..f02e3c80d0 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -696,7 +696,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_ETM(s) && SSL_USE_EXPLICIT_IV(s) && 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, 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); @@ -769,7 +769,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; |