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 5e6ecb31f5a26b060d2af3c3bf6dd0e68018e1bb..ef70c8898121642febcce7162c8aa67a0ca06ccb 100644 (file)
--- a/crypto/cast/c_enc.c
+++ b/crypto/cast/c_enc.c
@@ -56,12 +56,10 @@
  * [including the GNU Public Licence.]
  */
 
-#include "cast.h"
+#include <openssl/cast.h>
 #include "cast_lcl.h"
 
-void CAST_encrypt(data,key)
-CAST_LONG *data;
-CAST_KEY *key;
+void CAST_encrypt(CAST_LONG *data, CAST_KEY *key)
        {
        register CAST_LONG l,r,*k,t;
 
@@ -81,7 +79,7 @@ CAST_KEY *key;
        E_CAST( 9,k,r,l,+,^,-);
        E_CAST(10,k,l,r,^,-,+);
        E_CAST(11,k,r,l,-,+,^);
-       if(!k->short_key)
+       if(!key->short_key)
            {
            E_CAST(12,k,l,r,+,^,-);
            E_CAST(13,k,r,l,^,-,+);
@@ -93,9 +91,7 @@ CAST_KEY *key;
        data[0]=r&0xffffffffL;
        }
 
-void CAST_decrypt(data,key)
-CAST_LONG *data;
-CAST_KEY *key;
+void CAST_decrypt(CAST_LONG *data, CAST_KEY *key)
        {
        register CAST_LONG l,r,*k,t;
 
@@ -103,7 +99,7 @@ CAST_KEY *key;
        l=data[0];
        r=data[1];
 
-       if(!k->short_key)
+       if(!key->short_key)
            {
            E_CAST(15,k,l,r,+,^,-);
            E_CAST(14,k,r,l,-,+,^);
@@ -127,20 +123,15 @@ CAST_KEY *key;
        data[0]=r&0xffffffffL;
        }
 
-void CAST_cbc_encrypt(in, out, length, ks, iv, 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];
 
-       if (encrypt)
+       if (_encrypt)
                {
                n2l(iv,tout0);
                n2l(iv,tout1);