[PATCH] CRYPTO: Blowfish: Converted spaces to tabs in crypto/blowfish.c

[PATCH] CRYPTO: Blowfish: Converted spaces to tabs in crypto/blowfish.c

[Stewart Malik]

---
 crypto/blowfish.c |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/crypto/blowfish.c b/crypto/blowfish.c
index a67d52e..29c5389 100644
--- a/crypto/blowfish.c
+++ b/crypto/blowfish.c
@@ -309,9 +309,13 @@ static const u32 bf_sbox[256 * 4] = {
 #define GET32_0(x) (((x) >> (24)) & (0xff))
 
 #define bf_F(x) (((S[GET32_0(x)] + S[256 + GET32_1(x)]) ^ \
-          S[512 + GET32_2(x)]) + S[768 + GET32_3(x)])
+		S[512 + GET32_2(x)]) + S[768 + GET32_3(x)])
 
-#define ROUND(a, b, n)  b ^= P[n]; a ^= bf_F (b)
+#define ROUND(a, b, n)
+	do {
+		b ^= P[n];
+		a ^= bf_F(b);
+	} while (0)
 
 /*
  * The blowfish encipher, processes 64-bit blocks.
@@ -452,17 +456,17 @@ static int bf_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
 static struct crypto_alg alg = {
 	.cra_name		=	"blowfish",
 	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
-	.cra_blocksize		=	BF_BLOCK_SIZE,
-	.cra_ctxsize		=	sizeof(struct bf_ctx),
-	.cra_alignmask		=	3,
+	.cra_blocksize	=	BF_BLOCK_SIZE,
+	.cra_ctxsize	=	sizeof(struct bf_ctx),
+	.cra_alignmask	=	3,
 	.cra_module		=	THIS_MODULE,
 	.cra_list		=	LIST_HEAD_INIT(alg.cra_list),
 	.cra_u			=	{ .cipher = {
 	.cia_min_keysize	=	BF_MIN_KEY_SIZE,
 	.cia_max_keysize	=	BF_MAX_KEY_SIZE,
-	.cia_setkey   		= 	bf_setkey,
-	.cia_encrypt 		=	bf_encrypt,
-	.cia_decrypt  		=	bf_decrypt } }
+	.cia_setkey		=	bf_setkey,
+	.cia_encrypt	=	bf_encrypt,
+	.cia_decrypt	=	bf_decrypt } }
 };
 
 static int __init blowfish_mod_init(void)
-- 
1.6.0.4

Re: [PATCH] CRYPTO: Blowfish: Converted spaces to tabs in crypto/blowfish.c

[Herbert Xu]

On Sun, Mar 07, 2010 at 06:01:06PM +1030, Stewart Malik wrote:
>
> @@ -452,17 +456,17 @@ static int bf_setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
>  static struct crypto_alg alg = {
>  	.cra_name		=	"blowfish",
>  	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,
> -	.cra_blocksize		=	BF_BLOCK_SIZE,
> -	.cra_ctxsize		=	sizeof(struct bf_ctx),
> -	.cra_alignmask		=	3,
> +	.cra_blocksize	=	BF_BLOCK_SIZE,
> +	.cra_ctxsize	=	sizeof(struct bf_ctx),
> +	.cra_alignmask	=	3,

What's this bit for?
-- 
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt