1 files changed, 6 insertions, 12 deletions

diff --git a/src/lib/libcrypto/des/cfb_enc.c b/src/lib/libcrypto/des/cfb_enc.c
index 342e785691..17bf77ca9e 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)
@@ -106,7 +100,7 @@ int enc;
                         l-=n;
                         ti[0]=v0;
                         ti[1]=v1;
-                        des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
+                        DES_encrypt1((DES_LONG *)ti,schedule,DES_ENCRYPT);
                         c2ln(in,d0,d1,n);
                         in+=n;
                         d0=(d0^ti[0])&mask0;
@@ -138,7 +132,7 @@ int enc;
                         l-=n;
                         ti[0]=v0;
                         ti[1]=v1;
-                        des_encrypt((DES_LONG *)ti,schedule,DES_ENCRYPT);
+                        DES_encrypt1((DES_LONG *)ti,schedule,DES_ENCRYPT);
                         c2ln(in,d0,d1,n);
                         in+=n;
                         /* 30-08-94 - eay - changed because l>>32 and
@@ -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;