1 files changed, 7 insertions, 5 deletions

diff --git a/src/lib/libcrypto/evp/e_rc2.c b/src/lib/libcrypto/evp/e_rc2.c
index d42cbfd17e..d37726ffae 100644
--- a/src/lib/libcrypto/evp/e_rc2.c
+++ b/src/lib/libcrypto/evp/e_rc2.c
@@ -56,10 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_RC2
-
 #include <stdio.h>
 #include "cryptlib.h"
+
+#ifndef OPENSSL_NO_RC2
+
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include "evp_locl.h"
@@ -167,16 +168,17 @@ static int rc2_magic_to_meth(int i)
 static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type)
         {
         long num=0;
-        int i=0,l;
+        int i=0;
         int key_bits;
+        unsigned int l;
         unsigned char iv[EVP_MAX_IV_LENGTH];
 
         if (type != NULL)
                 {
                 l=EVP_CIPHER_CTX_iv_length(c);
-                OPENSSL_assert(l <= sizeof iv);
+                OPENSSL_assert(l <= sizeof(iv));
                 i=ASN1_TYPE_get_int_octetstring(type,&num,iv,l);
-                if (i != l)
+                if (i != (int)l)
                         return(-1);
                 key_bits =rc2_magic_to_meth((int)num);
                 if (!key_bits)