Due to an increasing number of clashes between modern OpenSSL and

[openssl.git] / crypto / des / cfb_enc.c

diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c
index 4af6f7fbf8c6a53cd5cae4589d25e322f7f62239..17bf77ca9e388ef0df43d6a390d3b19ad1eca328 100644 (file)
--- a/crypto/des/cfb_enc.c
+++ b/crypto/des/cfb_enc.c
@@ -64,8 +64,8 @@
  * the second.  The second 12 bits will come from the 3rd and half the 4th
  * byte.
  */
-void des_cfb_encrypt(const 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;
@@ -100,7 +100,7 @@ void des_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
                        l-=n;
                        ti[0]=v0;
                        ti[1]=v1;
-                       des_encrypt1((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;
@@ -132,7 +132,7 @@ void des_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
                        l-=n;
                        ti[0]=v0;
                        ti[1]=v1;
-                       des_encrypt1((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