Due to an increasing number of clashes between modern OpenSSL and

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

diff --git a/crypto/des/cfb64ede.c b/crypto/des/cfb64ede.c
index f9d13ef90aa5a51f09239004716e812fd0d00fc0..60c1aa08db46413c99017f48a511fa1f6cdb9cfe 100644 (file)
--- a/crypto/des/cfb64ede.c
+++ b/crypto/des/cfb64ede.c
@@ -63,10 +63,10 @@
  * 64bit block we have used is contained in *num;
  */
 
-void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                           long length, des_key_schedule *ks1,
-                           des_key_schedule *ks2, des_key_schedule *ks3,
-                           des_cblock *ivec, int *num, int enc)
+void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
+                           long length, DES_key_schedule *ks1,
+                           DES_key_schedule *ks2, DES_key_schedule *ks3,
+                           DES_cblock *ivec, int *num, int enc)
        {
        register DES_LONG v0,v1;
        register long l=length;
@@ -86,7 +86,7 @@ void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
 
                                ti[0]=v0;
                                ti[1]=v1;
-                               des_encrypt3(ti,ks1,ks2,ks3);
+                               DES_encrypt3(ti,ks1,ks2,ks3);
                                v0=ti[0];
                                v1=ti[1];
 
@@ -112,7 +112,7 @@ void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
 
                                ti[0]=v0;
                                ti[1]=v1;
-                               des_encrypt3(ti,ks1,ks2,ks3);
+                               DES_encrypt3(ti,ks1,ks2,ks3);
                                v0=ti[0];
                                v1=ti[1];
 
@@ -133,10 +133,10 @@ void des_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
        }
 
 #ifdef undef /* MACRO */
-void des_ede2_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-            des_key_schedule ks1, des_key_schedule ks2, des_cblock (*ivec),
+void DES_ede2_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
+            DES_key_schedule ks1, DES_key_schedule ks2, DES_cblock (*ivec),
             int *num, int enc)
        {
-       des_ede3_cfb64_encrypt(in,out,length,ks1,ks2,ks1,ivec,num,enc);
+       DES_ede3_cfb64_encrypt(in,out,length,ks1,ks2,ks1,ivec,num,enc);
        }
 #endif