diff options
| author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
|---|---|---|
| committer | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
| commit | 1c93dc3bd2d1f3f22f021b036c647db1316a7083 (patch) | |
| tree | 1678134117b42ea7af7d7b4c1f10e864d486ae25 /crypto/fcrypt.c | |
| parent | 39fa904443d5fef09dfeb90b94ec9892a5a96a35 (diff) | |
| parent | 30800d10f2872689cd78711f26b065494df8bb74 (diff) | |
| download | linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.tar.gz linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.zip | |
Merge mainline (v2.6.34-rc7)
Diffstat (limited to '')
| -rw-r--r-- | crypto/fcrypt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/fcrypt.c b/crypto/fcrypt.c index b82d61f4..c33107e3 100644 --- a/crypto/fcrypt.c +++ b/crypto/fcrypt.c @@ -60,13 +60,13 @@ do { \ u32 t = lo & ((1 << n) - 1); \ lo = (lo >> n) | ((hi & ((1 << n) - 1)) << (32 - n)); \ hi = (hi >> n) | (t << (24-n)); \ -} while(0) +} while (0) /* Rotate right one 64 bit number as a 56 bit number */ #define ror56_64(k, n) \ do { \ k = (k >> n) | ((k & ((1 << n) - 1)) << (56 - n)); \ -} while(0) +} while (0) /* * Sboxes for Feistel network derived from @@ -228,7 +228,7 @@ do { \ union lc4 { __be32 l; u8 c[4]; } u; \ u.l = sched ^ R; \ L ^= sbox0[u.c[0]] ^ sbox1[u.c[1]] ^ sbox2[u.c[2]] ^ sbox3[u.c[3]]; \ -} while(0) +} while (0) /* * encryptor |