Fix strange formatting by indent
[openssl.git] / crypto / des / ofb64ede.c
index 6a6b95c..a9cdfd6 100644 (file)
@@ -1,5 +1,5 @@
 /* crypto/des/ofb64ede.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * 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(in, out, length, k1,k2,k3, ivec, num)
-register unsigned char *in;
-register unsigned char *out;
-long length;
-des_key_schedule k1,k2,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=(unsigned char *)ivec;
+       iv = &(*ivec)[0];
        c2l(iv,v0);
        c2l(iv,v1);
        ti[0]=v0;
@@ -91,9 +89,9 @@ int *num;
                {
                if (n == 0)
                        {
-                       ti[0]=v0;
-                       ti[1]=v1;
-                       des_encrypt3((DES_LONG *)ti,k1,k2,k3);
+                       /* ti[0]=v0; */
+                       /* ti[1]=v1; */
+                       DES_encrypt3(ti,k1,k2,k3);
                        v0=ti[0];
                        v1=ti[1];
 
@@ -107,9 +105,9 @@ int *num;
                }
        if (save)
                {
-/*             v0=ti[0];
+/*-            v0=ti[0];
                v1=ti[1];*/
-               iv=(unsigned char *)ivec;
+               iv = &(*ivec)[0];
                l2c(v0,iv);
                l2c(v1,iv);
                }
@@ -118,14 +116,10 @@ int *num;
        }
 
 #ifdef undef /* MACRO */
-void des_ede2_ofb64_encrypt(in, out, length, k1,k2, ivec, num)
-register unsigned char *in;
-register unsigned char *out;
-long length;
-des_key_schedule k1,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