Fix warnings (from HEAD).
authorDr. Stephen Henson <steve@openssl.org>
Sat, 10 Sep 2011 21:18:37 +0000 (21:18 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 10 Sep 2011 21:18:37 +0000 (21:18 +0000)
crypto/evp/e_aes_cbc_hmac_sha1.c
crypto/evp/e_rc4_hmac_md5.c

index 78a013547071c9dab3af918e8c43ccb7e8ed1120..43fc26d0d164814cefc5500161ff1ae36ea523ee 100644 (file)
@@ -239,7 +239,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
                if (plen) {     /* "TLS" mode of operation */
                        /* figure out payload length */
-                       if (len<(out[len-1]+1+SHA_DIGEST_LENGTH))
+                       if (len<(size_t)(out[len-1]+1+SHA_DIGEST_LENGTH))
                                return 0;
 
                        len -= (out[len-1]+1+SHA_DIGEST_LENGTH);
@@ -288,7 +288,7 @@ static int aesni_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void
 
                memset (hmac_key,0,sizeof(hmac_key));
 
-               if (arg > sizeof(hmac_key)) {
+               if (arg > (int)sizeof(hmac_key)) {
                        SHA1_Init(&key->head);
                        SHA1_Update(&key->head,ptr,arg);
                        SHA1_Final(hmac_key,&key->head);
index 1fa2aa2b84bd5e4c4605ccf644b808528fce8761..94c011000c483b2d9fca30d788e369d699f66b4c 100644 (file)
@@ -224,7 +224,7 @@ static int rc4_hmac_md5_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
 
                memset (hmac_key,0,sizeof(hmac_key));
 
-               if (arg > sizeof(hmac_key)) {
+               if (arg > (int)sizeof(hmac_key)) {
                        MD5_Init(&key->head);
                        MD5_Update(&key->head,ptr,arg);
                        MD5_Final(hmac_key,&key->head);