Avoid shadowing, and a bit of constification while I'm at it.

[openssl.git] / crypto / cast / c_enc.c

diff --git a/crypto/cast/c_enc.c b/crypto/cast/c_enc.c
index b62b4680b0c0d3f877da075207beeece535a1487..ef70c8898121642febcce7162c8aa67a0ca06ccb 100644 (file)
--- a/crypto/cast/c_enc.c
+++ b/crypto/cast/c_enc.c
@@ -123,15 +123,15 @@ void CAST_decrypt(CAST_LONG *data, CAST_KEY *key)
        data[0]=r&0xffffffffL;
        }
 
        data[0]=r&0xffffffffL;
        }
 

-void CAST_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
-            CAST_KEY *ks, unsigned char *iv, int encrypt)
+void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
+            CAST_KEY *ks, unsigned char *iv, int _encrypt)

        {
        register CAST_LONG tin0,tin1;
        register CAST_LONG tout0,tout1,xor0,xor1;
        register long l=length;
        CAST_LONG tin[2];
 
        {
        register CAST_LONG tin0,tin1;
        register CAST_LONG tout0,tout1,xor0,xor1;
        register long l=length;
        CAST_LONG tin[2];
 

-       if (encrypt)
+       if (_encrypt)

                {
                n2l(iv,tout0);
                n2l(iv,tout1);
                {
                n2l(iv,tout0);
                n2l(iv,tout1);