OpenSSL 0.9.4 merge

1 files changed, 10 insertions, 15 deletions

diff --git a/src/lib/libcrypto/cast/c_cfb64.c b/src/lib/libcrypto/cast/c_cfb64.c
index c46c375f75..514c005c32 100644
--- a/src/lib/libcrypto/cast/c_cfb64.c
+++ b/src/lib/libcrypto/cast/c_cfb64.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "cast.h"
+#include <openssl/cast.h>
 #include "cast_lcl.h"
 
 /* The input and output encrypted as though 64bit cfb mode is being
@@ -64,14 +64,9 @@
  * 64bit block we have used is contained in *num;
  */
 
-void CAST_cfb64_encrypt(in, out, length, schedule, ivec, num, 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 enc)
         {
         register CAST_LONG v0,v1,t;
         register int n= *num;
@@ -79,8 +74,8 @@ int encrypt;
         CAST_LONG ti[2];
         unsigned char *iv,c,cc;
 
-        iv=(unsigned char *)ivec;
-        if (encrypt)
+        iv=ivec;
+        if (enc)
                 {
                 while (l--)
                         {
@@ -89,10 +84,10 @@ int encrypt;
                                 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);
-                                iv=(unsigned char *)ivec;
+                                iv=ivec;
                                 }
                         c= *(in++)^iv[n];
                         *(out++)=c;
@@ -109,10 +104,10 @@ int encrypt;
                                 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);
-                                iv=(unsigned char *)ivec;
+                                iv=ivec;
                                 }
                         cc= *(in++);
                         c=iv[n];