Commit 452ec049 authored by Julia Lawall's avatar Julia Lawall Committed by Herbert Xu
Browse files

crypto: camellia_generic - replace commas by semicolons and adjust code alignment 



Adjust alignment and replace commas by semicolons in automatically
generated code.

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2a128b4b

crypto/camellia_generic.c

+24 −24
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
	/* round 6 */

	subL[7] ^= subL[1]; subR[7] ^= subR[1];

	subL[1] ^= subR[1] & ~subR[9];

	dw = subL[1] & subL[9],

	dw = subL[1] & subL[9];

	subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl2) */

	/* round 8 */

	subL[11] ^= subL[1]; subR[11] ^= subR[1];
@@ -397,7 +397,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
	/* round 12 */

	subL[15] ^= subL[1]; subR[15] ^= subR[1];

	subL[1] ^= subR[1] & ~subR[17];

	dw = subL[1] & subL[17],

	dw = subL[1] & subL[17];

	subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl4) */

	/* round 14 */

	subL[19] ^= subL[1]; subR[19] ^= subR[1];
@@ -413,7 +413,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
		kw4l = subL[25]; kw4r = subR[25];

	} else {

		subL[1] ^= subR[1] & ~subR[25];

		dw = subL[1] & subL[25],

		dw = subL[1] & subL[25];

		subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl6) */

		/* round 20 */

		subL[27] ^= subL[1]; subR[27] ^= subR[1];
@@ -433,7 +433,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
		/* round 19 */

		subL[26] ^= kw4l; subR[26] ^= kw4r;

		kw4l ^= kw4r & ~subR[24];

		dw = kw4l & subL[24],

		dw = kw4l & subL[24];

		kw4r ^= rol32(dw, 1); /* modified for FL(kl5) */

	}

	/* round 17 */
@@ -443,7 +443,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
	/* round 13 */

	subL[18] ^= kw4l; subR[18] ^= kw4r;

	kw4l ^= kw4r & ~subR[16];

	dw = kw4l & subL[16],

	dw = kw4l & subL[16];

	kw4r ^= rol32(dw, 1); /* modified for FL(kl3) */

	/* round 11 */

	subL[14] ^= kw4l; subR[14] ^= kw4r;
@@ -452,7 +452,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
	/* round 7 */

	subL[10] ^= kw4l; subR[10] ^= kw4r;

	kw4l ^= kw4r & ~subR[8];

	dw = kw4l & subL[8],

	dw = kw4l & subL[8];

	kw4r ^= rol32(dw, 1); /* modified for FL(kl1) */

	/* round 5 */

	subL[6] ^= kw4l; subR[6] ^= kw4r;
@@ -477,7 +477,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
	SUBKEY_L(6) = subL[5] ^ subL[7]; /* round 5 */

	SUBKEY_R(6) = subR[5] ^ subR[7];

	tl = subL[10] ^ (subR[10] & ~subR[8]);

	dw = tl & subL[8],  /* FL(kl1) */

	dw = tl & subL[8];  /* FL(kl1) */

	tr = subR[10] ^ rol32(dw, 1);

	SUBKEY_L(7) = subL[6] ^ tl; /* round 6 */

	SUBKEY_R(7) = subR[6] ^ tr;
@@ -486,7 +486,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
	SUBKEY_L(9) = subL[9];       /* FLinv(kl2) */

	SUBKEY_R(9) = subR[9];

	tl = subL[7] ^ (subR[7] & ~subR[9]);

	dw = tl & subL[9],  /* FLinv(kl2) */

	dw = tl & subL[9];  /* FLinv(kl2) */

	tr = subR[7] ^ rol32(dw, 1);

	SUBKEY_L(10) = tl ^ subL[11]; /* round 7 */

	SUBKEY_R(10) = tr ^ subR[11];
@@ -499,7 +499,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
	SUBKEY_L(14) = subL[13] ^ subL[15]; /* round 11 */

	SUBKEY_R(14) = subR[13] ^ subR[15];

	tl = subL[18] ^ (subR[18] & ~subR[16]);

	dw = tl & subL[16], /* FL(kl3) */

	dw = tl & subL[16]; /* FL(kl3) */

	tr = subR[18] ^ rol32(dw, 1);

	SUBKEY_L(15) = subL[14] ^ tl; /* round 12 */

	SUBKEY_R(15) = subR[14] ^ tr;
@@ -508,7 +508,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
	SUBKEY_L(17) = subL[17];     /* FLinv(kl4) */

	SUBKEY_R(17) = subR[17];

	tl = subL[15] ^ (subR[15] & ~subR[17]);

	dw = tl & subL[17], /* FLinv(kl4) */

	dw = tl & subL[17]; /* FLinv(kl4) */

	tr = subR[15] ^ rol32(dw, 1);

	SUBKEY_L(18) = tl ^ subL[19]; /* round 13 */

	SUBKEY_R(18) = tr ^ subR[19];
@@ -527,7 +527,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
		SUBKEY_R(24) = subR[24] ^ subR[23];

	} else {

		tl = subL[26] ^ (subR[26] & ~subR[24]);

		dw = tl & subL[24], /* FL(kl5) */

		dw = tl & subL[24]; /* FL(kl5) */

		tr = subR[26] ^ rol32(dw, 1);

		SUBKEY_L(23) = subL[22] ^ tl; /* round 18 */

		SUBKEY_R(23) = subR[22] ^ tr;
@@ -536,7 +536,7 @@ static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max) 
		SUBKEY_L(25) = subL[25];     /* FLinv(kl6) */

		SUBKEY_R(25) = subR[25];

		tl = subL[23] ^ (subR[23] & ~subR[25]);

		dw = tl & subL[25], /* FLinv(kl6) */

		dw = tl & subL[25]; /* FLinv(kl6) */

		tr = subR[23] ^ rol32(dw, 1);

		SUBKEY_L(26) = tl ^ subL[27]; /* round 19 */

		SUBKEY_R(26) = tr ^ subR[27];