Skip to content

L
linux
Commit c6045d56 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Greg Kroah-Hartman
Browse files
Options

staging: skein: remove extra indentation 

Fix macros containing do/while blocks to be indented uniformly.

This patch fixes the checkpatch.pl warning:

WARNING: suspect code indent for conditional statements
Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7d27a184
Show whitespace changes
Inline Side-by-side
Showing with 189 additions and 189 deletions
drivers/staging/skein/skein_block.c
View file @ c6045d56
...@@ -57,45 +57,45 @@ ...@@ -57,45 +57,45 @@
#endif #endif
#endif #endif
#define ROUND256(p0, p1, p2, p3, ROT, r_num) \ #define ROUND256(p0, p1, p2, p3, ROT, r_num) \
do { \ do { \
X##p0 += X##p1; \ X##p0 += X##p1; \
X##p1 = rotl_64(X##p1, ROT##_0); \ X##p1 = rotl_64(X##p1, ROT##_0); \
X##p1 ^= X##p0; \ X##p1 ^= X##p0; \
X##p2 += X##p3; \ X##p2 += X##p3; \
X##p3 = rotl_64(X##p3, ROT##_1); \ X##p3 = rotl_64(X##p3, ROT##_1); \
X##p3 ^= X##p2; \ X##p3 ^= X##p2; \
} while (0) } while (0)
#if SKEIN_UNROLL_256 == 0 #if SKEIN_UNROLL_256 == 0
#define R256(p0, p1, p2, p3, ROT, r_num) /* fully unrolled */ \ #define R256(p0, p1, p2, p3, ROT, r_num) /* fully unrolled */ \
ROUND256(p0, p1, p2, p3, ROT, r_num) ROUND256(p0, p1, p2, p3, ROT, r_num)
#define I256(R) \ #define I256(R) \
do { \ do { \
/* inject the key schedule value */ \ /* inject the key schedule value */ \
X0 += ks[((R) + 1) % 5]; \ X0 += ks[((R) + 1) % 5]; \
X1 += ks[((R) + 2) % 5] + ts[((R) + 1) % 3]; \ X1 += ks[((R) + 2) % 5] + ts[((R) + 1) % 3]; \
X2 += ks[((R) + 3) % 5] + ts[((R) + 2) % 3]; \ X2 += ks[((R) + 3) % 5] + ts[((R) + 2) % 3]; \
X3 += ks[((R) + 4) % 5] + (R) + 1; \ X3 += ks[((R) + 4) % 5] + (R) + 1; \
} while (0) } while (0)
#else #else
/* looping version */ /* looping version */
#define R256(p0, p1, p2, p3, ROT, r_num) ROUND256(p0, p1, p2, p3, ROT, r_num) #define R256(p0, p1, p2, p3, ROT, r_num) ROUND256(p0, p1, p2, p3, ROT, r_num)
#define I256(R) \ #define I256(R) \
do { \ do { \
/* inject the key schedule value */ \ /* inject the key schedule value */ \
X0 += ks[r + (R) + 0]; \ X0 += ks[r + (R) + 0]; \
X1 += ks[r + (R) + 1] + ts[r + (R) + 0]; \ X1 += ks[r + (R) + 1] + ts[r + (R) + 0];\
X2 += ks[r + (R) + 2] + ts[r + (R) + 1]; \ X2 += ks[r + (R) + 2] + ts[r + (R) + 1];\
X3 += ks[r + (R) + 3] + r + (R); \ X3 += ks[r + (R) + 3] + r + (R); \
/* rotate key schedule */ \ /* rotate key schedule */ \
ks[r + (R) + 4] = ks[r + (R) - 1]; \ ks[r + (R) + 4] = ks[r + (R) - 1]; \
ts[r + (R) + 2] = ts[r + (R) - 1]; \ ts[r + (R) + 2] = ts[r + (R) - 1]; \
} while (0) } while (0)
#endif #endif
#define R256_8_ROUNDS(R) \ #define R256_8_ROUNDS(R) \
do { \ do { \
R256(0, 1, 2, 3, R_256_0, 8 * (R) + 1); \ R256(0, 1, 2, 3, R_256_0, 8 * (R) + 1); \
R256(0, 3, 2, 1, R_256_1, 8 * (R) + 2); \ R256(0, 3, 2, 1, R_256_1, 8 * (R) + 2); \
R256(0, 1, 2, 3, R_256_2, 8 * (R) + 3); \ R256(0, 1, 2, 3, R_256_2, 8 * (R) + 3); \
...@@ -106,7 +106,7 @@ do { \ ...@@ -106,7 +106,7 @@ do { \
R256(0, 1, 2, 3, R_256_6, 8 * (R) + 7); \ R256(0, 1, 2, 3, R_256_6, 8 * (R) + 7); \
R256(0, 3, 2, 1, R_256_7, 8 * (R) + 8); \ R256(0, 3, 2, 1, R_256_7, 8 * (R) + 8); \
I256(2 * (R) + 1); \ I256(2 * (R) + 1); \
} while (0) } while (0)
#define R256_UNROLL_R(NN) \ #define R256_UNROLL_R(NN) \
((SKEIN_UNROLL_256 == 0 && \ ((SKEIN_UNROLL_256 == 0 && \
...@@ -134,7 +134,7 @@ do { \ ...@@ -134,7 +134,7 @@ do { \
#endif #endif
#endif #endif
#define ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ #define ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \
do { \ do { \
X##p0 += X##p1; \ X##p0 += X##p1; \
X##p1 = rotl_64(X##p1, ROT##_0); \ X##p1 = rotl_64(X##p1, ROT##_0); \
X##p1 ^= X##p0; \ X##p1 ^= X##p0; \
...@@ -144,16 +144,16 @@ do { \ ...@@ -144,16 +144,16 @@ do { \
X##p4 += X##p5; \ X##p4 += X##p5; \
X##p5 = rotl_64(X##p5, ROT##_2); \ X##p5 = rotl_64(X##p5, ROT##_2); \
X##p5 ^= X##p4; \ X##p5 ^= X##p4; \
X##p6 += X##p7; X##p7 = rotl_64(X##p7, ROT##_3); \ X##p6 += X##p7; X##p7 = rotl_64(X##p7, ROT##_3);\
X##p7 ^= X##p6; \ X##p7 ^= X##p6; \
} while (0) } while (0)
#if SKEIN_UNROLL_512 == 0 #if SKEIN_UNROLL_512 == 0
#define R512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) /* unrolled */ \ #define R512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) /* unrolled */ \
ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num)
#define I512(R) \ #define I512(R) \
do { \ do { \
/* inject the key schedule value */ \ /* inject the key schedule value */ \
X0 += ks[((R) + 1) % 9]; \ X0 += ks[((R) + 1) % 9]; \
X1 += ks[((R) + 2) % 9]; \ X1 += ks[((R) + 2) % 9]; \
...@@ -163,14 +163,14 @@ do { \ ...@@ -163,14 +163,14 @@ do { \
X5 += ks[((R) + 6) % 9] + ts[((R) + 1) % 3]; \ X5 += ks[((R) + 6) % 9] + ts[((R) + 1) % 3]; \
X6 += ks[((R) + 7) % 9] + ts[((R) + 2) % 3]; \ X6 += ks[((R) + 7) % 9] + ts[((R) + 2) % 3]; \
X7 += ks[((R) + 8) % 9] + (R) + 1; \ X7 += ks[((R) + 8) % 9] + (R) + 1; \
} while (0) } while (0)
#else /* looping version */ #else /* looping version */
#define R512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ #define R512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \
ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \
#define I512(R) \ #define I512(R) \
do { \ do { \
/* inject the key schedule value */ \ /* inject the key schedule value */ \
X0 += ks[r + (R) + 0]; \ X0 += ks[r + (R) + 0]; \
X1 += ks[r + (R) + 1]; \ X1 += ks[r + (R) + 1]; \
...@@ -183,10 +183,10 @@ do { \ ...@@ -183,10 +183,10 @@ do { \
/* rotate key schedule */ \ /* rotate key schedule */ \
ks[r + (R) + 8] = ks[r + (R) - 1]; \ ks[r + (R) + 8] = ks[r + (R) - 1]; \
ts[r + (R) + 2] = ts[r + (R) - 1]; \ ts[r + (R) + 2] = ts[r + (R) - 1]; \
} while (0) } while (0)
#endif /* end of looped code definitions */ #endif /* end of looped code definitions */
#define R512_8_ROUNDS(R) /* do 8 full rounds */ \ #define R512_8_ROUNDS(R) /* do 8 full rounds */ \
do { \ do { \
R512(0, 1, 2, 3, 4, 5, 6, 7, R_512_0, 8 * (R) + 1); \ R512(0, 1, 2, 3, 4, 5, 6, 7, R_512_0, 8 * (R) + 1); \
R512(2, 1, 4, 7, 6, 5, 0, 3, R_512_1, 8 * (R) + 2); \ R512(2, 1, 4, 7, 6, 5, 0, 3, R_512_1, 8 * (R) + 2); \
R512(4, 1, 6, 3, 0, 5, 2, 7, R_512_2, 8 * (R) + 3); \ R512(4, 1, 6, 3, 0, 5, 2, 7, R_512_2, 8 * (R) + 3); \
...@@ -197,7 +197,7 @@ do { \ ...@@ -197,7 +197,7 @@ do { \
R512(4, 1, 6, 3, 0, 5, 2, 7, R_512_6, 8 * (R) + 7); \ R512(4, 1, 6, 3, 0, 5, 2, 7, R_512_6, 8 * (R) + 7); \
R512(6, 1, 0, 7, 2, 5, 4, 3, R_512_7, 8 * (R) + 8); \ R512(6, 1, 0, 7, 2, 5, 4, 3, R_512_7, 8 * (R) + 8); \
I512(2 * (R) + 1); /* and key injection */ \ I512(2 * (R) + 1); /* and key injection */ \
} while (0) } while (0)
#define R512_UNROLL_R(NN) \ #define R512_UNROLL_R(NN) \
((SKEIN_UNROLL_512 == 0 && \ ((SKEIN_UNROLL_512 == 0 && \
SKEIN_512_ROUNDS_TOTAL/8 > (NN)) || \ SKEIN_512_ROUNDS_TOTAL/8 > (NN)) || \
...@@ -224,7 +224,7 @@ do { \ ...@@ -224,7 +224,7 @@ do { \
#endif #endif
#define ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, \ #define ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, \
pF, ROT, r_num) \ pF, ROT, r_num) \
do { \ do { \
X##p0 += X##p1; \ X##p0 += X##p1; \
X##p1 = rotl_64(X##p1, ROT##_0); \ X##p1 = rotl_64(X##p1, ROT##_0); \
X##p1 ^= X##p0; \ X##p1 ^= X##p0; \
...@@ -249,7 +249,7 @@ do { \ ...@@ -249,7 +249,7 @@ do { \
X##pE += X##pF; \ X##pE += X##pF; \
X##pF = rotl_64(X##pF, ROT##_7); \ X##pF = rotl_64(X##pF, ROT##_7); \
X##pF ^= X##pE; \ X##pF ^= X##pE; \
} while (0) } while (0)
#if SKEIN_UNROLL_1024 == 0 #if SKEIN_UNROLL_1024 == 0
#define R1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, pF, \ #define R1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, pF, \
...@@ -258,7 +258,7 @@ do { \ ...@@ -258,7 +258,7 @@ do { \
pF, ROT, rn) \ pF, ROT, rn) \
#define I1024(R) \ #define I1024(R) \
do { \ do { \
/* inject the key schedule value */ \ /* inject the key schedule value */ \
X00 += ks[((R) + 1) % 17]; \ X00 += ks[((R) + 1) % 17]; \
X01 += ks[((R) + 2) % 17]; \ X01 += ks[((R) + 2) % 17]; \
...@@ -276,7 +276,7 @@ do { \ ...@@ -276,7 +276,7 @@ do { \
X13 += ks[((R) + 14) % 17] + ts[((R) + 1) % 3]; \ X13 += ks[((R) + 14) % 17] + ts[((R) + 1) % 3]; \
X14 += ks[((R) + 15) % 17] + ts[((R) + 2) % 3]; \ X14 += ks[((R) + 15) % 17] + ts[((R) + 2) % 3]; \
X15 += ks[((R) + 16) % 17] + (R) + 1; \ X15 += ks[((R) + 16) % 17] + (R) + 1; \
} while (0) } while (0)
#else /* looping version */ #else /* looping version */
#define R1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, pF, \ #define R1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, pF, \
ROT, rn) \ ROT, rn) \
...@@ -284,7 +284,7 @@ do { \ ...@@ -284,7 +284,7 @@ do { \
pF, ROT, rn) \ pF, ROT, rn) \
#define I1024(R) \ #define I1024(R) \
do { \ do { \
/* inject the key schedule value */ \ /* inject the key schedule value */ \
X00 += ks[r + (R) + 0]; \ X00 += ks[r + (R) + 0]; \
X01 += ks[r + (R) + 1]; \ X01 += ks[r + (R) + 1]; \
...@@ -305,30 +305,30 @@ do { \ ...@@ -305,30 +305,30 @@ do { \
/* rotate key schedule */ \ /* rotate key schedule */ \
ks[r + (R) + 16] = ks[r + (R) - 1]; \ ks[r + (R) + 16] = ks[r + (R) - 1]; \
ts[r + (R) + 2] = ts[r + (R) - 1]; \ ts[r + (R) + 2] = ts[r + (R) - 1]; \
} while (0) } while (0)
#endif #endif
#define R1024_8_ROUNDS(R) \ #define R1024_8_ROUNDS(R) \
do { \ do { \
R1024(00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 13, 14, 15, \ R1024(00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, \
R1024_0, 8*(R) + 1); \ 13, 14, 15, R1024_0, 8*(R) + 1); \
R1024(00, 09, 02, 13, 06, 11, 04, 15, 10, 07, 12, 03, 14, 05, 08, 01, \ R1024(00, 09, 02, 13, 06, 11, 04, 15, 10, 07, 12, 03, 14, \
R1024_1, 8*(R) + 2); \ 05, 08, 01, R1024_1, 8*(R) + 2); \
R1024(00, 07, 02, 05, 04, 03, 06, 01, 12, 15, 14, 13, 08, 11, 10, 09, \ R1024(00, 07, 02, 05, 04, 03, 06, 01, 12, 15, 14, 13, 08, \
R1024_2, 8*(R) + 3); \ 11, 10, 09, R1024_2, 8*(R) + 3); \
R1024(00, 15, 02, 11, 06, 13, 04, 09, 14, 01, 08, 05, 10, 03, 12, 07, \ R1024(00, 15, 02, 11, 06, 13, 04, 09, 14, 01, 08, 05, 10, \
R1024_3, 8*(R) + 4); \ 03, 12, 07, R1024_3, 8*(R) + 4); \
I1024(2*(R)); \ I1024(2*(R)); \
R1024(00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 13, 14, 15, \ R1024(00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, \
R1024_4, 8*(R) + 5); \ 13, 14, 15, R1024_4, 8*(R) + 5); \
R1024(00, 09, 02, 13, 06, 11, 04, 15, 10, 07, 12, 03, 14, 05, 08, 01, \ R1024(00, 09, 02, 13, 06, 11, 04, 15, 10, 07, 12, 03, 14, \
R1024_5, 8*(R) + 6); \ 05, 08, 01, R1024_5, 8*(R) + 6); \
R1024(00, 07, 02, 05, 04, 03, 06, 01, 12, 15, 14, 13, 08, 11, 10, 09, \ R1024(00, 07, 02, 05, 04, 03, 06, 01, 12, 15, 14, 13, 08, \
R1024_6, 8*(R) + 7); \ 11, 10, 09, R1024_6, 8*(R) + 7); \
R1024(00, 15, 02, 11, 06, 13, 04, 09, 14, 01, 08, 05, 10, 03, 12, 07, \ R1024(00, 15, 02, 11, 06, 13, 04, 09, 14, 01, 08, 05, 10, \
R1024_7, 8*(R) + 8); \ 03, 12, 07, R1024_7, 8*(R) + 8); \
I1024(2*(R)+1); \ I1024(2*(R)+1); \
} while (0) } while (0)
#define R1024_UNROLL_R(NN) \ #define R1024_UNROLL_R(NN) \
((SKEIN_UNROLL_1024 == 0 && \ ((SKEIN_UNROLL_1024 == 0 && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7