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

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

diff --git a/crypto/cast/c_cfb64.c b/crypto/cast/c_cfb64.c
index 50d234b4667a6a3b4aaad1bee8715f13c9cee3c6..095e05a563a42ceb3fd88f0fb61ce258f90fdb1f 100644 (file)
--- a/crypto/cast/c_cfb64.c
+++ b/crypto/cast/c_cfb64.c
@@ -64,8 +64,9 @@
  * 64bit block we have used is contained in *num;
  */
 
  * 64bit block we have used is contained in *num;
  */
 

-void CAST_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-            CAST_KEY *schedule, unsigned char *ivec, int *num, int encrypt)
+void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
+                       long length, CAST_KEY *schedule, unsigned char *ivec,
+                       int *num, int _encrypt)

        {
        register CAST_LONG v0,v1,t;
        register int n= *num;
        {
        register CAST_LONG v0,v1,t;
        register int n= *num;


@@ -73,8 +74,8 @@ void CAST_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
        CAST_LONG ti[2];
        unsigned char *iv,c,cc;
 
        CAST_LONG ti[2];
        unsigned char *iv,c,cc;
 

-       iv=(unsigned char *)ivec;
-       if (encrypt)
+       iv=ivec;
+       if (_encrypt)

                {
                while (l--)
                        {
                {
                while (l--)
                        {


@@ -83,10 +84,10 @@ void CAST_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
                                n2l(iv,v0); ti[0]=v0;
                                n2l(iv,v1); ti[1]=v1;
                                CAST_encrypt((CAST_LONG *)ti,schedule);
                                n2l(iv,v0); ti[0]=v0;
                                n2l(iv,v1); ti[1]=v1;
                                CAST_encrypt((CAST_LONG *)ti,schedule);

-                               iv=(unsigned char *)ivec;
+                               iv=ivec;

                                t=ti[0]; l2n(t,iv);
                                t=ti[1]; l2n(t,iv);
                                t=ti[0]; l2n(t,iv);
                                t=ti[1]; l2n(t,iv);

-                               iv=(unsigned char *)ivec;
+                               iv=ivec;

                                }
                        c= *(in++)^iv[n];
                        *(out++)=c;
                                }
                        c= *(in++)^iv[n];
                        *(out++)=c;


@@ -103,10 +104,10 @@ void CAST_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
                                n2l(iv,v0); ti[0]=v0;
                                n2l(iv,v1); ti[1]=v1;
                                CAST_encrypt((CAST_LONG *)ti,schedule);
                                n2l(iv,v0); ti[0]=v0;
                                n2l(iv,v1); ti[1]=v1;
                                CAST_encrypt((CAST_LONG *)ti,schedule);

-                               iv=(unsigned char *)ivec;
+                               iv=ivec;

                                t=ti[0]; l2n(t,iv);
                                t=ti[1]; l2n(t,iv);
                                t=ti[0]; l2n(t,iv);
                                t=ti[1]; l2n(t,iv);

-                               iv=(unsigned char *)ivec;
+                               iv=ivec;

                                }
                        cc= *(in++);
                        c=iv[n];
                                }
                        cc= *(in++);
                        c=iv[n];