]> granicus.if.org Git - openssl/commitdiff
Fix signed/unsigned comparisons.
authorFelix Laurie von Massenbach <felix@erbridge.co.uk>
Sun, 15 Jun 2014 10:58:33 +0000 (11:58 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 17 Jun 2014 16:41:46 +0000 (17:41 +0100)
crypto/evp/e_aes_cbc_hmac_sha256.c
ssl/s3_pkt.c

index c6c05d936b009609d1eb7bf87f4aecfeecbb4cd4..31db13ef8d5cb1166b3b8e036aca247aa749daf6 100644 (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 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];
 
index 02302a5dbf36a2159173e18e075a13d429ec75ec..f02e3c80d0d7319e5828b965ed25b3183a6decde 100644 (file)
@@ -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;