Bring des_locl.h at the same level as in the 0.9.7 branch.

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

diff --git a/crypto/des/ofb64ede.c b/crypto/des/ofb64ede.c
index 36245de79320e3f21a60d76928512c05653a7ccf..26bbf9a6a73343622c1407a65a4e8d09e25e3dd1 100644 (file)
--- a/crypto/des/ofb64ede.c
+++ b/crypto/des/ofb64ede.c
@@ -62,20 +62,22 @@
  * used.  The extra state information to record how much of the
  * 64bit block we have used is contained in *num;
  */
-void des_ede3_ofb64_encrypt(register const unsigned char *in,
-            register unsigned char *out, long length, des_key_schedule k1,
-            des_key_schedule k2, des_key_schedule k3, des_cblock ivec, int *num)
+void DES_ede3_ofb64_encrypt(register const unsigned char *in,
+                           register unsigned char *out, long length,
+                           DES_key_schedule *k1, DES_key_schedule *k2,
+                           DES_key_schedule *k3, DES_cblock *ivec,
+                           int *num)
        {
        register DES_LONG v0,v1;
        register int n= *num;
        register long l=length;
-       des_cblock d;
+       DES_cblock d;
        register char *dp;
        DES_LONG ti[2];
        unsigned char *iv;
        int save=0;
 
-       iv=ivec;
+       iv = &(*ivec)[0];
        c2l(iv,v0);
        c2l(iv,v1);
        ti[0]=v0;
@@ -89,7 +91,7 @@ void des_ede3_ofb64_encrypt(register const unsigned char *in,
                        {
                        /* ti[0]=v0; */
                        /* ti[1]=v1; */
-                       des_encrypt3(ti,k1,k2,k3);
+                       DES_encrypt3(ti,k1,k2,k3);
                        v0=ti[0];
                        v1=ti[1];
 
@@ -105,7 +107,7 @@ void des_ede3_ofb64_encrypt(register const unsigned char *in,
                {
 /*             v0=ti[0];
                v1=ti[1];*/
-               iv=ivec;
+               iv = &(*ivec)[0];
                l2c(v0,iv);
                l2c(v1,iv);
                }
@@ -114,10 +116,10 @@ void des_ede3_ofb64_encrypt(register const unsigned char *in,
        }
 
 #ifdef undef /* MACRO */
-void des_ede2_ofb64_encrypt(register unsigned char *in,
-            register unsigned char *out, long length, des_key_schedule k1,
-            des_key_schedule k2, des_cblock (*ivec), int *num)
+void DES_ede2_ofb64_encrypt(register unsigned char *in,
+            register unsigned char *out, long length, DES_key_schedule k1,
+            DES_key_schedule k2, DES_cblock (*ivec), int *num)
        {
-       des_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num);
+       DES_ede3_ofb64_encrypt(in, out, length, k1,k2,k1, ivec, num);
        }
 #endif