Camellia fixes and improvements from HEAD.

[oweals/openssl.git] / crypto / des / fcrypt_b.c

diff --git a/crypto/des/fcrypt_b.c b/crypto/des/fcrypt_b.c
index 22c87f598368b0edda0d776b4d2e709b1eadec10..1390138787ff93e8e304922f39e25909e5de07f2 100644 (file)
--- a/crypto/des/fcrypt_b.c
+++ b/crypto/des/fcrypt_b.c
@@ -77,12 +77,12 @@
 #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;