Messages in this thread Patch in this message |  | | | From | Denis Vlasenko <> | | Subject | [PATCH 0.5/4 :) ] ROR -> ror32 | | Date | Sun, 3 Jul 2005 16:00:20 +0300 |
| |
Remove local ROR, use ror32 instead. diff -urpN linux-2.6.12.0.orig/crypto/des.c linux-2.6.12.05.n/crypto/des.c --- linux-2.6.12.0.orig/crypto/des.c Tue Oct 19 00:55:29 2004 +++ linux-2.6.12.05.n/crypto/des.c Sun Jul 3 15:27:12 2005 @@ -35,8 +35,6 @@ #define DES3_EDE_EXPKEY_WORDS (3 * DES_EXPKEY_WORDS) #define DES3_EDE_BLOCK_SIZE DES_BLOCK_SIZE -#define ROR(d,c,o) ((d) = (d) >> (c) | (d) << (o)) - struct des_ctx { u8 iv[DES_BLOCK_SIZE]; u32 expkey[DES_EXPKEY_WORDS]; @@ -1159,9 +1157,7 @@ not_weak: w |= (b1[k[18+24]] | b0[k[19+24]]) << 4; w |= (b1[k[20+24]] | b0[k[21+24]]) << 2; w |= b1[k[22+24]] | b0[k[23+24]]; - - ROR(w, 4, 28); /* could be eliminated */ - expkey[1] = w; + expkey[1] = ror32(w, 4); /* could be eliminated */ k += 48; expkey += 2; |  |