Redundant now as it's moved to ./Makefile.org.
[openssl.git] / crypto / des / fcrypt_b.c
index 83c94054e3ced6ca9e4932c65560ee3ea97043b7..1390138787ff93e8e304922f39e25909e5de07f2 100644 (file)
 #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
        (a)=(a)^(t)^(t>>(16-(n))))\
 
-void fcrypt_body(DES_LONG *out, des_key_schedule ks, DES_LONG Eswap0,
-            DES_LONG Eswap1)
+void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
+                DES_LONG Eswap1)
        {
        register DES_LONG l,r,t,u;
 #ifdef DES_PTR
-       register const unsigned char *des_SP=(const unsigned char *)des_SPtrans;
+       register const unsigned char *des_SP=(const unsigned char *)DES_SPtrans;
 #endif
        register DES_LONG *s;
        register int j;
@@ -97,7 +97,7 @@ void fcrypt_body(DES_LONG *out, des_key_schedule ks, DES_LONG Eswap0,
 
        for (j=0; j<25; j++)
                {
-#ifdef DES_UNROLL
+#ifndef DES_UNROLL
                register int i;
 
                for (i=0; i<32; i+=8)