diff options
author | Richard Hartmann <richih.mailinglist@gmail.com> | 2010-02-16 07:29:01 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-02-16 07:29:01 -0500 |
commit | a1f4c9222d5e71f9c2646f47beb4a0a42b42fdc4 (patch) | |
tree | 9a25e718938deffab9682d13d5b88208bc167b97 | |
parent | 621dd3692978a7dd84df2d8ea822b805b40de498 (diff) |
crypto: cast5 - Fix checkpatch errors
Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | crypto/cast5.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/cast5.c b/crypto/cast5.c index 8cbe28fa0e0c..a1d2294b50ad 100644 --- a/crypto/cast5.c +++ b/crypto/cast5.c | |||
@@ -569,12 +569,12 @@ static const u32 sb8[256] = { | |||
569 | 0xeaee6801, 0x8db2a283, 0xea8bf59e | 569 | 0xeaee6801, 0x8db2a283, 0xea8bf59e |
570 | }; | 570 | }; |
571 | 571 | ||
572 | #define F1(D,m,r) ( (I = ((m) + (D))), (I=rol32(I,(r))), \ | 572 | #define F1(D, m, r) ((I = ((m) + (D))), (I = rol32(I, (r))), \ |
573 | (((s1[I >> 24] ^ s2[(I>>16)&0xff]) - s3[(I>>8)&0xff]) + s4[I&0xff]) ) | 573 | (((s1[I >> 24] ^ s2[(I>>16)&0xff]) - s3[(I>>8)&0xff]) + s4[I&0xff])) |
574 | #define F2(D,m,r) ( (I = ((m) ^ (D))), (I=rol32(I,(r))), \ | 574 | #define F2(D, m, r) ((I = ((m) ^ (D))), (I = rol32(I, (r))), \ |
575 | (((s1[I >> 24] - s2[(I>>16)&0xff]) + s3[(I>>8)&0xff]) ^ s4[I&0xff]) ) | 575 | (((s1[I >> 24] - s2[(I>>16)&0xff]) + s3[(I>>8)&0xff]) ^ s4[I&0xff])) |
576 | #define F3(D,m,r) ( (I = ((m) - (D))), (I=rol32(I,(r))), \ | 576 | #define F3(D, m, r) ((I = ((m) - (D))), (I = rol32(I, (r))), \ |
577 | (((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff]) ) | 577 | (((s1[I >> 24] + s2[(I>>16)&0xff]) ^ s3[(I>>8)&0xff]) - s4[I&0xff])) |
578 | 578 | ||
579 | 579 | ||
580 | static void cast5_encrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf) | 580 | static void cast5_encrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf) |
@@ -694,7 +694,7 @@ static void cast5_decrypt(struct crypto_tfm *tfm, u8 *outbuf, const u8 *inbuf) | |||
694 | dst[1] = cpu_to_be32(l); | 694 | dst[1] = cpu_to_be32(l); |
695 | } | 695 | } |
696 | 696 | ||
697 | static void key_schedule(u32 * x, u32 * z, u32 * k) | 697 | static void key_schedule(u32 *x, u32 *z, u32 *k) |
698 | { | 698 | { |
699 | 699 | ||
700 | #define xi(i) ((x[(i)/4] >> (8*(3-((i)%4)))) & 0xff) | 700 | #define xi(i) ((x[(i)/4] >> (8*(3-((i)%4)))) & 0xff) |