diff options
author | djm <> | 2010-10-01 22:59:01 +0000 |
---|---|---|
committer | djm <> | 2010-10-01 22:59:01 +0000 |
commit | fe047d8b632246cb2db3234a0a4f32e5c318857b (patch) | |
tree | 939b752540947d33507b3acc48d76a8bfb7c3dc3 /src/lib/libcrypto/des/fcrypt_b.c | |
parent | 2ea67f4aa254b09ded62e6e14fc893bbe6381579 (diff) | |
download | openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.gz openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.tar.bz2 openbsd-fe047d8b632246cb2db3234a0a4f32e5c318857b.zip |
resolve conflicts, fix local changes
Diffstat (limited to 'src/lib/libcrypto/des/fcrypt_b.c')
-rw-r--r-- | src/lib/libcrypto/des/fcrypt_b.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libcrypto/des/fcrypt_b.c b/src/lib/libcrypto/des/fcrypt_b.c index c56b461e91..87fc71eb26 100644 --- a/src/lib/libcrypto/des/fcrypt_b.c +++ b/src/lib/libcrypto/des/fcrypt_b.c | |||
@@ -102,12 +102,10 @@ void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0, | |||
102 | #ifndef DES_UNROLL | 102 | #ifndef DES_UNROLL |
103 | register int i; | 103 | register int i; |
104 | 104 | ||
105 | for (i=0; i<32; i+=8) | 105 | for (i=0; i<32; i+=4) |
106 | { | 106 | { |
107 | D_ENCRYPT(l,r,i+0); /* 1 */ | 107 | D_ENCRYPT(l,r,i+0); /* 1 */ |
108 | D_ENCRYPT(r,l,i+2); /* 2 */ | 108 | D_ENCRYPT(r,l,i+2); /* 2 */ |
109 | D_ENCRYPT(l,r,i+4); /* 1 */ | ||
110 | D_ENCRYPT(r,l,i+6); /* 2 */ | ||
111 | } | 109 | } |
112 | #else | 110 | #else |
113 | D_ENCRYPT(l,r, 0); /* 1 */ | 111 | D_ENCRYPT(l,r, 0); /* 1 */ |