OpenSSL 0.9.4 merge

1 files changed, 4 insertions, 10 deletions

diff --git a/src/lib/libcrypto/des/cfb_enc.c b/src/lib/libcrypto/des/cfb_enc.c
index 342e785691..cca34dd7c5 100644
--- a/src/lib/libcrypto/des/cfb_enc.c
+++ b/src/lib/libcrypto/des/cfb_enc.c
@@ -64,14 +64,8 @@
  * the second.  The second 12 bits will come from the 3rd and half the 4th
  * byte.
  */
-void des_cfb_encrypt(in, out, numbits, length, schedule, ivec, enc)
-unsigned char *in;
-unsigned char *out;
-int numbits;
-long length;
-des_key_schedule schedule;
-des_cblock (*ivec);
-int enc;
+void des_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
+             long length, des_key_schedule schedule, des_cblock *ivec, int enc)
         {
         register DES_LONG d0,d1,v0,v1,n=(numbits+7)/8;
         register DES_LONG mask0,mask1;
@@ -96,7 +90,7 @@ int enc;
                 mask1=0x00000000L;
                 }
 
-        iv=(unsigned char *)ivec;
+        iv = &(*ivec)[0];
         c2l(iv,v0);
         c2l(iv,v1);
         if (enc)
@@ -163,7 +157,7 @@ int enc;
                         out+=n;
                         }
                 }
-        iv=(unsigned char *)ivec;
+        iv = &(*ivec)[0];
         l2c(v0,iv);
         l2c(v1,iv);
         v0=v1=d0=d1=ti[0]=ti[1]=0;