diff options
| author | Richard Hartmann <richih.mailinglist@gmail.com> | 2010-02-16 07:24:30 -0500 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-02-16 07:24:30 -0500 |
| commit | 0d8fb0a139093297851f56e2070bf580e9667dd7 (patch) | |
| tree | d90c41bdf58f14fbf3d4c9c5e0e714f6d0200f87 | |
| parent | 3922538fe1625e6ddded56c08c290b3440846cfd (diff) | |
crypto: blowfish - 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/blowfish.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crypto/blowfish.c b/crypto/blowfish.c index 6f5b48731922..a67d52ee0580 100644 --- a/crypto/blowfish.c +++ b/crypto/blowfish.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Cryptographic API. | 2 | * Cryptographic API. |
| 3 | * | 3 | * |
| 4 | * Blowfish Cipher Algorithm, by Bruce Schneier. | 4 | * Blowfish Cipher Algorithm, by Bruce Schneier. |
| @@ -299,7 +299,7 @@ static const u32 bf_sbox[256 * 4] = { | |||
| 299 | 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6, | 299 | 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6, |
| 300 | }; | 300 | }; |
| 301 | 301 | ||
| 302 | /* | 302 | /* |
| 303 | * Round loop unrolling macros, S is a pointer to a S-Box array | 303 | * Round loop unrolling macros, S is a pointer to a S-Box array |
| 304 | * organized in 4 unsigned longs at a row. | 304 | * organized in 4 unsigned longs at a row. |
| 305 | */ | 305 | */ |
| @@ -315,7 +315,7 @@ static const u32 bf_sbox[256 * 4] = { | |||
| 315 | 315 | ||
| 316 | /* | 316 | /* |
| 317 | * The blowfish encipher, processes 64-bit blocks. | 317 | * The blowfish encipher, processes 64-bit blocks. |
| 318 | * NOTE: This function MUSTN'T respect endianess | 318 | * NOTE: This function MUSTN'T respect endianess |
| 319 | */ | 319 | */ |
| 320 | static void encrypt_block(struct bf_ctx *bctx, u32 *dst, u32 *src) | 320 | static void encrypt_block(struct bf_ctx *bctx, u32 *dst, u32 *src) |
| 321 | { | 321 | { |
| @@ -395,7 +395,7 @@ static void bf_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) | |||
| 395 | out_blk[1] = cpu_to_be32(yl); | 395 | out_blk[1] = cpu_to_be32(yl); |
| 396 | } | 396 | } |
| 397 | 397 | ||
| 398 | /* | 398 | /* |
| 399 | * Calculates the blowfish S and P boxes for encryption and decryption. | 399 | * Calculates the blowfish S and P boxes for encryption and decryption. |
| 400 | */ | 400 | */ |
| 401 | static int bf_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) | 401 | static int bf_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) |
| @@ -417,10 +417,10 @@ static int bf_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) | |||
| 417 | 417 | ||
| 418 | /* Actual subkey generation */ | 418 | /* Actual subkey generation */ |
| 419 | for (j = 0, i = 0; i < 16 + 2; i++) { | 419 | for (j = 0, i = 0; i < 16 + 2; i++) { |
| 420 | temp = (((u32 )key[j] << 24) | | 420 | temp = (((u32)key[j] << 24) | |
| 421 | ((u32 )key[(j + 1) % keylen] << 16) | | 421 | ((u32)key[(j + 1) % keylen] << 16) | |
| 422 | ((u32 )key[(j + 2) % keylen] << 8) | | 422 | ((u32)key[(j + 2) % keylen] << 8) | |
| 423 | ((u32 )key[(j + 3) % keylen])); | 423 | ((u32)key[(j + 3) % keylen])); |
| 424 | 424 | ||
| 425 | P[i] = P[i] ^ temp; | 425 | P[i] = P[i] ^ temp; |
| 426 | j = (j + 4) % keylen; | 426 | j = (j + 4) % keylen; |
| @@ -444,7 +444,7 @@ static int bf_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) | |||
| 444 | S[count + 1] = data[1]; | 444 | S[count + 1] = data[1]; |
| 445 | } | 445 | } |
| 446 | } | 446 | } |
| 447 | 447 | ||
| 448 | /* Bruce says not to bother with the weak key check. */ | 448 | /* Bruce says not to bother with the weak key check. */ |
| 449 | return 0; | 449 | return 0; |
| 450 | } | 450 | } |
