Fix signed/unsigned comparisons.

(cherry picked from commit 50cc4f7b3d64621b6062ad1f16a7630b7c730d9b)

diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c
index c6c05d936b009609d1eb7bf87f4aecfeecbb4cd4..31db13ef8d5cb1166b3b8e036aca247aa749daf6 100644 (file)
--- a/crypto/evp/e_aes_cbc_hmac_sha256.c
+++ b/crypto/evp/e_aes_cbc_hmac_sha256.c
@@ -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 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];
 

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index fe46cb0b88f4c1e5d41aa421a15ad4f490df4991..d7293ccd8a4a38456bd593bd571c2a6c1fc24b4f 100644 (file)
--- 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;