PR: 2727

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

diff --git a/crypto/des/fcrypt_b.c b/crypto/des/fcrypt_b.c
index 83c94054e3ced6ca9e4932c65560ee3ea97043b7..8822816938ddddfc2cdf6f2f341959f0e55978c8 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;
@@ -97,15 +97,13 @@ 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)
+               for (i=0; i<32; i+=4)
                        {
                        D_ENCRYPT(l,r,i+0); /*  1 */
                        D_ENCRYPT(r,l,i+2); /*  2 */
-                       D_ENCRYPT(l,r,i+4); /*  1 */
-                       D_ENCRYPT(r,l,i+6); /*  2 */
                        }
 #else
                D_ENCRYPT(l,r, 0); /*  1 */