* [PATCH] Fixed Conditional white space problems
@ 2014-09-28 21:54 Eric Rost
2014-09-28 22:01 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Eric Rost @ 2014-09-28 21:54 UTC (permalink / raw)
To: gregkh, jason, jake, antonysaraev; +Cc: devel, linux-kernel
My first patch, resent to appropriate multiple addresses!
This patch fixes the following checkpatch.pl Warnings:
WARNING: suspect code indent for conditional statements (16, 16)
+ for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512)
[...]
+ {
WARNING: suspect code indent for conditional statements (16, 16)
+ for (r = 1; r <= 2 * RCNT; r += 2 * SKEIN_UNROLL_1024)
[...]
+ {
Signed-off-by: Eric Rost <eric.rost@mybabylon.net>
---
drivers/staging/skein/skein_block.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c
index 616364f..bbb5a5b 100644
--- a/drivers/staging/skein/skein_block.c
+++ b/drivers/staging/skein/skein_block.c
@@ -380,7 +380,7 @@ do { \
for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512)
#endif /* end of looped code definitions */
- {
+ {
#define R512_8_ROUNDS(R) /* do 8 full rounds */ \
do { \
R512(0, 1, 2, 3, 4, 5, 6, 7, R_512_0, 8 * (R) + 1); \
@@ -447,7 +447,7 @@ do { \
#if (SKEIN_UNROLL_512 > 14)
#error "need more unrolling in skein_512_process_block"
#endif
- }
+ }
/* do the final "feedforward" xor, update context chaining */
ctx->x[0] = X0 ^ w[0];
@@ -659,7 +659,7 @@ do { \
for (r = 1; r <= 2 * RCNT; r += 2 * SKEIN_UNROLL_1024)
#endif
- {
+ {
#define R1024_8_ROUNDS(R) \
do { \
R1024(00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 13, 14, 15, \
@@ -734,7 +734,7 @@ do { \
#if (SKEIN_UNROLL_1024 > 14)
#error "need more unrolling in Skein_1024_Process_Block"
#endif
- }
+ }
/* do the final "feedforward" xor, update context chaining */
ctx->x[0] = X00 ^ w[0];
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] Fixed Conditional white space problems 2014-09-28 21:54 [PATCH] Fixed Conditional white space problems Eric Rost @ 2014-09-28 22:01 ` Greg KH 2014-09-28 22:53 ` Jason Cooper 0 siblings, 1 reply; 5+ messages in thread From: Greg KH @ 2014-09-28 22:01 UTC (permalink / raw) To: Eric Rost; +Cc: jason, jake, antonysaraev, devel, linux-kernel On Sun, Sep 28, 2014 at 04:54:26PM -0500, Eric Rost wrote: > My first patch, resent to appropriate multiple addresses! That's great, but it doesn't belong here in the body of the changelog :) > This patch fixes the following checkpatch.pl Warnings: > > WARNING: suspect code indent for conditional statements (16, 16) > + for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512) > [...] > + { > > WARNING: suspect code indent for conditional statements (16, 16) > + for (r = 1; r <= 2 * RCNT; r += 2 * SKEIN_UNROLL_1024) > [...] > + { Your subject should give a clue as to what part of the kernel it modifies, for this patch, it might look like: staging: skein: fixed conditional... Care to fix that up and resend? thanks, greg k-h ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Fixed Conditional white space problems 2014-09-28 22:01 ` Greg KH @ 2014-09-28 22:53 ` Jason Cooper 2014-09-28 23:27 ` Joe Perches 0 siblings, 1 reply; 5+ messages in thread From: Jason Cooper @ 2014-09-28 22:53 UTC (permalink / raw) To: Greg KH; +Cc: Eric Rost, jake, antonysaraev, devel, linux-kernel On Sun, Sep 28, 2014 at 06:01:01PM -0400, Greg KH wrote: > On Sun, Sep 28, 2014 at 04:54:26PM -0500, Eric Rost wrote: > > My first patch, resent to appropriate multiple addresses! > > That's great, but it doesn't belong here in the body of the changelog :) > > > This patch fixes the following checkpatch.pl Warnings: > > > > WARNING: suspect code indent for conditional statements (16, 16) > > + for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512) > > [...] > > + { > > > > WARNING: suspect code indent for conditional statements (16, 16) > > + for (r = 1; r <= 2 * RCNT; r += 2 * SKEIN_UNROLL_1024) > > [...] > > + { > > Your subject should give a clue as to what part of the kernel it > modifies, for this patch, it might look like: > staging: skein: fixed conditional... > > Care to fix that up and resend? With Greg's comments addressed, Acked-by: Jason Cooper <jason@lakedaemon.net> thx, Jason. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Fixed Conditional white space problems 2014-09-28 22:53 ` Jason Cooper @ 2014-09-28 23:27 ` Joe Perches 2014-09-28 23:35 ` Eric Rost 0 siblings, 1 reply; 5+ messages in thread From: Joe Perches @ 2014-09-28 23:27 UTC (permalink / raw) To: Jason Cooper; +Cc: Greg KH, Eric Rost, jake, antonysaraev, devel, linux-kernel On Sun, 2014-09-28 at 18:53 -0400, Jason Cooper wrote: > On Sun, Sep 28, 2014 at 06:01:01PM -0400, Greg KH wrote: > > On Sun, Sep 28, 2014 at 04:54:26PM -0500, Eric Rost wrote: > > > My first patch, resent to appropriate multiple addresses! > > > > That's great, but it doesn't belong here in the body of the changelog :) > > > > > This patch fixes the following checkpatch.pl Warnings: > > > > > > WARNING: suspect code indent for conditional statements (16, 16) > > > + for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512) > > > [...] > > > + { > > > > > > WARNING: suspect code indent for conditional statements (16, 16) > > > + for (r = 1; r <= 2 * RCNT; r += 2 * SKEIN_UNROLL_1024) > > > [...] > > > + { > > > > Your subject should give a clue as to what part of the kernel it > > modifies, for this patch, it might look like: > > staging: skein: fixed conditional... > > > > Care to fix that up and resend? > > With Greg's comments addressed, > > Acked-by: Jason Cooper <jason@lakedaemon.net> Actually, I think these are false positives due to the odd #ifdef uses. Were I to try to make it more kernel style like, I'd end up doing something like this: Expand multiple statements on a line Neaten #defines Whitespace changes and alignment Multi-statement macros should use do {} while (0) --- drivers/staging/skein/skein_block.c | 827 +++++++++++++++++++----------------- 1 file changed, 440 insertions(+), 387 deletions(-) diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c index 616364f..a4f2aef 100644 --- a/drivers/staging/skein/skein_block.c +++ b/drivers/staging/skein/skein_block.c @@ -1,18 +1,18 @@ /*********************************************************************** -** -** Implementation of the Skein block functions. -** -** Source code author: Doug Whiting, 2008. -** -** This algorithm and source code is released to the public domain. -** -** Compile-time switches: -** -** SKEIN_USE_ASM -- set bits (256/512/1024) to select which -** versions use ASM code for block processing -** [default: use C for all block sizes] -** -************************************************************************/ + ** + ** Implementation of the Skein block functions. + ** + ** Source code author: Doug Whiting, 2008. + ** + ** This algorithm and source code is released to the public domain. + ** + ** Compile-time switches: + ** + ** SKEIN_USE_ASM -- set bits (256/512/1024) to select which + ** versions use ASM code for block processing + ** [default: use C for all block sizes] + ** + ************************************************************************/ #include <linux/string.h> #include "skein.h" @@ -26,15 +26,18 @@ #define SKEIN_LOOP 001 /* default: unroll 256 and 512, but not 1024 */ #endif -#define BLK_BITS (WCNT*64) /* some useful definitions for code here */ +#define BLK_BITS (WCNT * 64) /* some useful definitions for code here */ #define KW_TWK_BASE (0) #define KW_KEY_BASE (3) #define ks (kw + KW_KEY_BASE) #define ts (kw + KW_TWK_BASE) #ifdef SKEIN_DEBUG -#define debug_save_tweak(ctx) { \ - ctx->h.tweak[0] = ts[0]; ctx->h.tweak[1] = ts[1]; } +#define debug_save_tweak(ctx) \ +do { \ + ctx->h.tweak[0] = ts[0]; \ + ctx->h.tweak[1] = ts[1]; \ +} while (0) #else #define debug_save_tweak(ctx) #endif @@ -43,7 +46,7 @@ #if !(SKEIN_USE_ASM & 256) void skein_256_process_block(struct skein_256_ctx *ctx, const u8 *blk_ptr, size_t blk_cnt, size_t byte_cnt_add) - { /* do it in C */ +{ /* do it in C */ enum { WCNT = SKEIN_256_STATE_WORDS }; @@ -60,22 +63,27 @@ void skein_256_process_block(struct skein_256_ctx *ctx, const u8 *blk_ptr, #if (RCNT % SKEIN_UNROLL_256) #error "Invalid SKEIN_UNROLL_256" /* sanity check on unroll count */ #endif - size_t r; - u64 kw[WCNT+4+RCNT*2]; /* key schedule: chaining vars + tweak + "rot"*/ + size_t r; + /* key schedule: chaining vars + tweak + "rot"*/ + u64 kw[WCNT + 4 + RCNT * 2]; #else - u64 kw[WCNT+4]; /* key schedule words : chaining vars + tweak */ + /* key schedule words : chaining vars + tweak */ + u64 kw[WCNT + 4]; #endif - u64 X0, X1, X2, X3; /* local copy of context vars, for speed */ - u64 w[WCNT]; /* local copy of input block */ + u64 X0, X1, X2, X3; /* local copy of context vars, for speed */ + u64 w[WCNT]; /* local copy of input block */ #ifdef SKEIN_DEBUG const u64 *X_ptr[4]; /* use for debugging (help cc put Xn in regs) */ - X_ptr[0] = &X0; X_ptr[1] = &X1; X_ptr[2] = &X2; X_ptr[3] = &X3; + X_ptr[0] = &X0; + X_ptr[1] = &X1; + X_ptr[2] = &X2; + X_ptr[3] = &X3; #endif skein_assert(blk_cnt != 0); /* never call with blk_cnt == 0! */ ts[0] = ctx->h.tweak[0]; ts[1] = ctx->h.tweak[1]; - do { + do { /* * this implementation only supports 2**64 input bytes * (no carry out here) @@ -109,118 +117,121 @@ void skein_256_process_block(struct skein_256_ctx *ctx, const u8 *blk_ptr, /* run the rounds */ -#define ROUND256(p0, p1, p2, p3, ROT, r_num) \ -do { \ - X##p0 += X##p1; X##p1 = rotl_64(X##p1, ROT##_0); X##p1 ^= X##p0; \ - X##p2 += X##p3; X##p3 = rotl_64(X##p3, ROT##_1); X##p3 ^= X##p2; \ +#define ROUND256(p0, p1, p2, p3, ROT, r_num) \ +do { \ + X##p0 += X##p1; \ + X##p1 = rotl_64(X##p1, ROT##_0); \ + X##p1 ^= X##p0; \ + X##p2 += X##p3; \ + X##p3 = rotl_64(X##p3, ROT##_1); X##p3 ^= X##p2; \ } while (0) #if SKEIN_UNROLL_256 == 0 -#define R256(p0, p1, p2, p3, ROT, r_num) /* fully unrolled */ \ -do { \ - ROUND256(p0, p1, p2, p3, ROT, r_num); \ - skein_show_r_ptr(BLK_BITS, &ctx->h, r_num, X_ptr); \ +#define R256(p0, p1, p2, p3, ROT, r_num) /* fully unrolled */ \ +do { \ + ROUND256(p0, p1, p2, p3, ROT, r_num); \ + skein_show_r_ptr(BLK_BITS, &ctx->h, r_num, X_ptr); \ } while (0) -#define I256(R) \ -do { \ - /* inject the key schedule value */ \ - X0 += ks[((R)+1) % 5]; \ - X1 += ks[((R)+2) % 5] + ts[((R)+1) % 3]; \ - X2 += ks[((R)+3) % 5] + ts[((R)+2) % 3]; \ - X3 += ks[((R)+4) % 5] + (R)+1; \ +#define I256(R) \ +do { \ + /* inject the key schedule value */ \ + X0 += ks[((R) + 1) % 5]; \ + X1 += ks[((R) + 2) % 5] + ts[((R) + 1) % 3]; \ + X2 += ks[((R) + 3) % 5] + ts[((R) + 2) % 3]; \ + X3 += ks[((R) + 4) % 5] + (R)+1; \ skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ } while (0) #else /* looping version */ -#define R256(p0, p1, p2, p3, ROT, r_num) \ -do { \ - ROUND256(p0, p1, p2, p3, ROT, r_num); \ +#define R256(p0, p1, p2, p3, ROT, r_num) \ +do { \ + ROUND256(p0, p1, p2, p3, ROT, r_num); \ skein_show_r_ptr(BLK_BITS, &ctx->h, 4 * (r - 1) + r_num, X_ptr); \ } while (0) -#define I256(R) \ -do { \ - /* inject the key schedule value */ \ - X0 += ks[r+(R)+0]; \ - X1 += ks[r+(R)+1] + ts[r+(R)+0]; \ - X2 += ks[r+(R)+2] + ts[r+(R)+1]; \ - X3 += ks[r+(R)+3] + r+(R); \ - /* rotate key schedule */ \ - ks[r + (R) + 4] = ks[r + (R) - 1]; \ - ts[r + (R) + 2] = ts[r + (R) - 1]; \ +#define I256(R) \ +do { \ + /* inject the key schedule value */ \ + X0 += ks[r+(R) + 0]; \ + X1 += ks[r+(R) + 1] + ts[r + (R) + 0]; \ + X2 += ks[r+(R) + 2] + ts[r + (R) + 1]; \ + X3 += ks[r+(R) + 3] + r + (R); \ + /* rotate key schedule */ \ + ks[r + (R) + 4] = ks[r + (R) - 1]; \ + ts[r + (R) + 2] = ts[r + (R) - 1]; \ skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ } while (0) - for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_256) + for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_256) #endif { -#define R256_8_ROUNDS(R) \ -do { \ - R256(0, 1, 2, 3, R_256_0, 8 * (R) + 1); \ - R256(0, 3, 2, 1, R_256_1, 8 * (R) + 2); \ - R256(0, 1, 2, 3, R_256_2, 8 * (R) + 3); \ - R256(0, 3, 2, 1, R_256_3, 8 * (R) + 4); \ - I256(2 * (R)); \ - R256(0, 1, 2, 3, R_256_4, 8 * (R) + 5); \ - R256(0, 3, 2, 1, R_256_5, 8 * (R) + 6); \ - R256(0, 1, 2, 3, R_256_6, 8 * (R) + 7); \ - R256(0, 3, 2, 1, R_256_7, 8 * (R) + 8); \ - I256(2 * (R) + 1); \ +#define R256_8_ROUNDS(R) \ +do { \ + R256(0, 1, 2, 3, R_256_0, 8 * (R) + 1); \ + R256(0, 3, 2, 1, R_256_1, 8 * (R) + 2); \ + R256(0, 1, 2, 3, R_256_2, 8 * (R) + 3); \ + R256(0, 3, 2, 1, R_256_3, 8 * (R) + 4); \ + I256(2 * (R)); \ + R256(0, 1, 2, 3, R_256_4, 8 * (R) + 5); \ + R256(0, 3, 2, 1, R_256_5, 8 * (R) + 6); \ + R256(0, 1, 2, 3, R_256_6, 8 * (R) + 7); \ + R256(0, 3, 2, 1, R_256_7, 8 * (R) + 8); \ + I256(2 * (R) + 1); \ } while (0) - R256_8_ROUNDS(0); + R256_8_ROUNDS(0); -#define R256_UNROLL_R(NN) \ - ((SKEIN_UNROLL_256 == 0 && \ - SKEIN_256_ROUNDS_TOTAL/8 > (NN)) || \ +#define R256_UNROLL_R(NN) \ + ((SKEIN_UNROLL_256 == 0 && SKEIN_256_ROUNDS_TOTAL/8 > (NN)) || \ (SKEIN_UNROLL_256 > (NN))) - #if R256_UNROLL_R(1) - R256_8_ROUNDS(1); - #endif - #if R256_UNROLL_R(2) - R256_8_ROUNDS(2); - #endif - #if R256_UNROLL_R(3) - R256_8_ROUNDS(3); - #endif - #if R256_UNROLL_R(4) - R256_8_ROUNDS(4); - #endif - #if R256_UNROLL_R(5) - R256_8_ROUNDS(5); - #endif - #if R256_UNROLL_R(6) - R256_8_ROUNDS(6); - #endif - #if R256_UNROLL_R(7) - R256_8_ROUNDS(7); - #endif - #if R256_UNROLL_R(8) - R256_8_ROUNDS(8); - #endif - #if R256_UNROLL_R(9) - R256_8_ROUNDS(9); - #endif - #if R256_UNROLL_R(10) - R256_8_ROUNDS(10); - #endif - #if R256_UNROLL_R(11) - R256_8_ROUNDS(11); - #endif - #if R256_UNROLL_R(12) - R256_8_ROUNDS(12); - #endif - #if R256_UNROLL_R(13) - R256_8_ROUNDS(13); - #endif - #if R256_UNROLL_R(14) - R256_8_ROUNDS(14); - #endif - #if (SKEIN_UNROLL_256 > 14) +#if R256_UNROLL_R(1) + R256_8_ROUNDS(1); +#endif +#if R256_UNROLL_R(2) + R256_8_ROUNDS(2); +#endif +#if R256_UNROLL_R(3) + R256_8_ROUNDS(3); +#endif +#if R256_UNROLL_R(4) + R256_8_ROUNDS(4); +#endif +#if R256_UNROLL_R(5) + R256_8_ROUNDS(5); +#endif +#if R256_UNROLL_R(6) + R256_8_ROUNDS(6); +#endif +#if R256_UNROLL_R(7) + R256_8_ROUNDS(7); +#endif +#if R256_UNROLL_R(8) + R256_8_ROUNDS(8); +#endif +#if R256_UNROLL_R(9) + R256_8_ROUNDS(9); +#endif +#if R256_UNROLL_R(10) + R256_8_ROUNDS(10); +#endif +#if R256_UNROLL_R(11) + R256_8_ROUNDS(11); +#endif +#if R256_UNROLL_R(12) + R256_8_ROUNDS(12); +#endif +#if R256_UNROLL_R(13) + R256_8_ROUNDS(13); +#endif +#if R256_UNROLL_R(14) + R256_8_ROUNDS(14); +#endif +#if (SKEIN_UNROLL_256 > 14) #error "need more unrolling in skein_256_process_block" - #endif +#endif } + /* do the final "feedforward" xor, update context chaining */ ctx->x[0] = X0 ^ w[0]; ctx->x[1] = X1 ^ w[1]; @@ -231,6 +242,7 @@ do { \ ts[1] &= ~SKEIN_T1_FLAG_FIRST; } while (--blk_cnt); + ctx->h.tweak[0] = ts[0]; ctx->h.tweak[1] = ts[1]; } @@ -238,8 +250,8 @@ do { \ #if defined(SKEIN_CODE_SIZE) || defined(SKEIN_PERF) size_t skein_256_process_block_code_size(void) { - return ((u8 *) skein_256_process_block_code_size) - - ((u8 *) skein_256_process_block); + return ((u8 *)skein_256_process_block_code_size) - + ((u8 *)skein_256_process_block); } unsigned int skein_256_unroll_cnt(void) { @@ -260,7 +272,7 @@ void skein_512_process_block(struct skein_512_ctx *ctx, const u8 *blk_ptr, #define RCNT (SKEIN_512_ROUNDS_TOTAL/8) #ifdef SKEIN_LOOP /* configure how much to unroll the loop */ -#define SKEIN_UNROLL_512 (((SKEIN_LOOP)/10)%10) +#define SKEIN_UNROLL_512 (((SKEIN_LOOP) / 10) % 10) #else #define SKEIN_UNROLL_512 (0) #endif @@ -269,24 +281,32 @@ void skein_512_process_block(struct skein_512_ctx *ctx, const u8 *blk_ptr, #if (RCNT % SKEIN_UNROLL_512) #error "Invalid SKEIN_UNROLL_512" /* sanity check on unroll count */ #endif - size_t r; - u64 kw[WCNT+4+RCNT*2]; /* key sched: chaining vars + tweak + "rot"*/ + size_t r; + /* key sched: chaining vars + tweak + "rot"*/ + u64 kw[WCNT + 4 + RCNT * 2]; #else - u64 kw[WCNT+4]; /* key schedule words : chaining vars + tweak */ + /* key schedule words : chaining vars + tweak */ + u64 kw[WCNT + 4]; #endif - u64 X0, X1, X2, X3, X4, X5, X6, X7; /* local copies, for speed */ - u64 w[WCNT]; /* local copy of input block */ + u64 X0, X1, X2, X3, X4, X5, X6, X7; /* local copies, for speed */ + u64 w[WCNT]; /* local copy of input block */ #ifdef SKEIN_DEBUG const u64 *X_ptr[8]; /* use for debugging (help cc put Xn in regs) */ - X_ptr[0] = &X0; X_ptr[1] = &X1; X_ptr[2] = &X2; X_ptr[3] = &X3; - X_ptr[4] = &X4; X_ptr[5] = &X5; X_ptr[6] = &X6; X_ptr[7] = &X7; + X_ptr[0] = &X0; + X_ptr[1] = &X1; + X_ptr[2] = &X2; + X_ptr[3] = &X3; + X_ptr[4] = &X4; + X_ptr[5] = &X5; + X_ptr[6] = &X6; + X_ptr[7] = &X7; #endif skein_assert(blk_cnt != 0); /* never call with blk_cnt == 0! */ ts[0] = ctx->h.tweak[0]; ts[1] = ctx->h.tweak[1]; - do { + do { /* * this implementation only supports 2**64 input bytes * (no carry out here) @@ -312,141 +332,148 @@ void skein_512_process_block(struct skein_512_ctx *ctx, const u8 *blk_ptr, debug_save_tweak(ctx); skein_show_block(BLK_BITS, &ctx->h, ctx->x, blk_ptr, w, ks, ts); - X0 = w[0] + ks[0]; /* do the first full key injection */ - X1 = w[1] + ks[1]; - X2 = w[2] + ks[2]; - X3 = w[3] + ks[3]; - X4 = w[4] + ks[4]; - X5 = w[5] + ks[5] + ts[0]; - X6 = w[6] + ks[6] + ts[1]; - X7 = w[7] + ks[7]; + X0 = w[0] + ks[0]; /* do the first full key injection */ + X1 = w[1] + ks[1]; + X2 = w[2] + ks[2]; + X3 = w[3] + ks[3]; + X4 = w[4] + ks[4]; + X5 = w[5] + ks[5] + ts[0]; + X6 = w[6] + ks[6] + ts[1]; + X7 = w[7] + ks[7]; blk_ptr += SKEIN_512_BLOCK_BYTES; skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INITIAL, X_ptr); /* run the rounds */ -#define ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ -do { \ - X##p0 += X##p1; X##p1 = rotl_64(X##p1, ROT##_0); X##p1 ^= X##p0; \ - X##p2 += X##p3; X##p3 = rotl_64(X##p3, ROT##_1); X##p3 ^= X##p2; \ - X##p4 += X##p5; X##p5 = rotl_64(X##p5, ROT##_2); X##p5 ^= X##p4; \ - X##p6 += X##p7; X##p7 = rotl_64(X##p7, ROT##_3); X##p7 ^= X##p6; \ +#define ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ +do { \ + X##p0 += X##p1; \ + X##p1 = rotl_64(X##p1, ROT##_0); \ + X##p1 ^= X##p0; \ + X##p2 += X##p3; \ + X##p3 = rotl_64(X##p3, ROT##_1); \ + X##p3 ^= X##p2; \ + X##p4 += X##p5; \ + X##p5 = rotl_64(X##p5, ROT##_2); \ + X##p5 ^= X##p4; \ + X##p6 += X##p7; \ + X##p7 = rotl_64(X##p7, ROT##_3); \ + X##p7 ^= X##p6; \ } while (0) #if SKEIN_UNROLL_512 == 0 #define R512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) /* unrolled */ \ -do { \ - ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ - skein_show_r_ptr(BLK_BITS, &ctx->h, r_num, X_ptr); \ +do { \ + ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num); \ + skein_show_r_ptr(BLK_BITS, &ctx->h, r_num, X_ptr); \ } while (0) -#define I512(R) \ -do { \ - /* inject the key schedule value */ \ - X0 += ks[((R) + 1) % 9]; \ - X1 += ks[((R) + 2) % 9]; \ - X2 += ks[((R) + 3) % 9]; \ - X3 += ks[((R) + 4) % 9]; \ - X4 += ks[((R) + 5) % 9]; \ - X5 += ks[((R) + 6) % 9] + ts[((R) + 1) % 3]; \ - X6 += ks[((R) + 7) % 9] + ts[((R) + 2) % 3]; \ - X7 += ks[((R) + 8) % 9] + (R) + 1; \ +#define I512(R) \ +do { \ + /* inject the key schedule value */ \ + X0 += ks[((R) + 1) % 9]; \ + X1 += ks[((R) + 2) % 9]; \ + X2 += ks[((R) + 3) % 9]; \ + X3 += ks[((R) + 4) % 9]; \ + X4 += ks[((R) + 5) % 9]; \ + X5 += ks[((R) + 6) % 9] + ts[((R) + 1) % 3]; \ + X6 += ks[((R) + 7) % 9] + ts[((R) + 2) % 3]; \ + X7 += ks[((R) + 8) % 9] + (R) + 1; \ skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ } while (0) #else /* looping version */ -#define R512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ -do { \ - ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num); \ +#define R512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ +do { \ + ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num); \ skein_show_r_ptr(BLK_BITS, &ctx->h, 4 * (r - 1) + r_num, X_ptr); \ } while (0) -#define I512(R) \ -do { \ - /* inject the key schedule value */ \ - X0 += ks[r + (R) + 0]; \ - X1 += ks[r + (R) + 1]; \ - X2 += ks[r + (R) + 2]; \ - X3 += ks[r + (R) + 3]; \ - X4 += ks[r + (R) + 4]; \ - X5 += ks[r + (R) + 5] + ts[r + (R) + 0]; \ - X6 += ks[r + (R) + 6] + ts[r + (R) + 1]; \ - X7 += ks[r + (R) + 7] + r + (R); \ - /* rotate key schedule */ \ - ks[r + (R) + 8] = ks[r + (R) - 1]; \ - ts[r + (R) + 2] = ts[r + (R) - 1]; \ +#define I512(R) \ +do { \ + /* inject the key schedule value */ \ + X0 += ks[r + (R) + 0]; \ + X1 += ks[r + (R) + 1]; \ + X2 += ks[r + (R) + 2]; \ + X3 += ks[r + (R) + 3]; \ + X4 += ks[r + (R) + 4]; \ + X5 += ks[r + (R) + 5] + ts[r + (R) + 0]; \ + X6 += ks[r + (R) + 6] + ts[r + (R) + 1]; \ + X7 += ks[r + (R) + 7] + r + (R); \ + /* rotate key schedule */ \ + ks[r + (R) + 8] = ks[r + (R) - 1]; \ + ts[r + (R) + 2] = ts[r + (R) - 1]; \ skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ } while (0) for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512) #endif /* end of looped code definitions */ { -#define R512_8_ROUNDS(R) /* do 8 full rounds */ \ -do { \ - 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(4, 1, 6, 3, 0, 5, 2, 7, R_512_2, 8 * (R) + 3); \ - R512(6, 1, 0, 7, 2, 5, 4, 3, R_512_3, 8 * (R) + 4); \ - I512(2 * (R)); \ - R512(0, 1, 2, 3, 4, 5, 6, 7, R_512_4, 8 * (R) + 5); \ - R512(2, 1, 4, 7, 6, 5, 0, 3, R_512_5, 8 * (R) + 6); \ - 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); \ - I512(2 * (R) + 1); /* and key injection */ \ +#define R512_8_ROUNDS(R) /* do 8 full rounds */ \ +do { \ + 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(4, 1, 6, 3, 0, 5, 2, 7, R_512_2, 8 * (R) + 3); \ + R512(6, 1, 0, 7, 2, 5, 4, 3, R_512_3, 8 * (R) + 4); \ + I512(2 * (R)); \ + R512(0, 1, 2, 3, 4, 5, 6, 7, R_512_4, 8 * (R) + 5); \ + R512(2, 1, 4, 7, 6, 5, 0, 3, R_512_5, 8 * (R) + 6); \ + 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); \ + I512(2 * (R) + 1); /* and key injection */ \ } while (0) R512_8_ROUNDS(0); -#define R512_UNROLL_R(NN) \ - ((SKEIN_UNROLL_512 == 0 && \ - SKEIN_512_ROUNDS_TOTAL/8 > (NN)) || \ - (SKEIN_UNROLL_512 > (NN))) +#define R512_UNROLL_R(NN) \ + ((SKEIN_UNROLL_512 == 0 && SKEIN_512_ROUNDS_TOTAL/8 > (NN)) || \ + (SKEIN_UNROLL_512 > (NN))) - #if R512_UNROLL_R(1) +#if R512_UNROLL_R(1) R512_8_ROUNDS(1); - #endif - #if R512_UNROLL_R(2) +#endif +#if R512_UNROLL_R(2) R512_8_ROUNDS(2); - #endif - #if R512_UNROLL_R(3) +#endif +#if R512_UNROLL_R(3) R512_8_ROUNDS(3); - #endif - #if R512_UNROLL_R(4) +#endif +#if R512_UNROLL_R(4) R512_8_ROUNDS(4); - #endif - #if R512_UNROLL_R(5) +#endif +#if R512_UNROLL_R(5) R512_8_ROUNDS(5); - #endif - #if R512_UNROLL_R(6) +#endif +#if R512_UNROLL_R(6) R512_8_ROUNDS(6); - #endif - #if R512_UNROLL_R(7) +#endif +#if R512_UNROLL_R(7) R512_8_ROUNDS(7); - #endif - #if R512_UNROLL_R(8) +#endif +#if R512_UNROLL_R(8) R512_8_ROUNDS(8); - #endif - #if R512_UNROLL_R(9) +#endif +#if R512_UNROLL_R(9) R512_8_ROUNDS(9); - #endif - #if R512_UNROLL_R(10) +#endif +#if R512_UNROLL_R(10) R512_8_ROUNDS(10); - #endif - #if R512_UNROLL_R(11) +#endif +#if R512_UNROLL_R(11) R512_8_ROUNDS(11); - #endif - #if R512_UNROLL_R(12) +#endif +#if R512_UNROLL_R(12) R512_8_ROUNDS(12); - #endif - #if R512_UNROLL_R(13) +#endif +#if R512_UNROLL_R(13) R512_8_ROUNDS(13); - #endif - #if R512_UNROLL_R(14) +#endif +#if R512_UNROLL_R(14) R512_8_ROUNDS(14); - #endif - #if (SKEIN_UNROLL_512 > 14) +#endif +#if (SKEIN_UNROLL_512 > 14) #error "need more unrolling in skein_512_process_block" - #endif +#endif } /* do the final "feedforward" xor, update context chaining */ @@ -469,8 +496,8 @@ do { \ #if defined(SKEIN_CODE_SIZE) || defined(SKEIN_PERF) size_t skein_512_process_block_code_size(void) { - return ((u8 *) skein_512_process_block_code_size) - - ((u8 *) skein_512_process_block); + return ((u8 *)skein_512_process_block_code_size) - + ((u8 *)skein_512_process_block); } unsigned int skein_512_unroll_cnt(void) { @@ -500,31 +527,43 @@ void skein_1024_process_block(struct skein_1024_ctx *ctx, const u8 *blk_ptr, #if (RCNT % SKEIN_UNROLL_1024) #error "Invalid SKEIN_UNROLL_1024" /* sanity check on unroll count */ #endif - size_t r; - u64 kw[WCNT+4+RCNT*2]; /* key sched: chaining vars + tweak + "rot" */ + size_t r; + /* key sched: chaining vars + tweak + "rot" */ + u64 kw[WCNT + 4 + RCNT * 2]; #else - u64 kw[WCNT+4]; /* key schedule words : chaining vars + tweak */ + /* key schedule words : chaining vars + tweak */ + u64 kw[WCNT + 4]; #endif /* local copy of vars, for speed */ - u64 X00, X01, X02, X03, X04, X05, X06, X07, - X08, X09, X10, X11, X12, X13, X14, X15; - u64 w[WCNT]; /* local copy of input block */ + u64 X00, X01, X02, X03, X04, X05, X06, X07, + X08, X09, X10, X11, X12, X13, X14, X15; + u64 w[WCNT]; /* local copy of input block */ #ifdef SKEIN_DEBUG const u64 *X_ptr[16]; /* use for debugging (help cc put Xn in regs) */ - X_ptr[0] = &X00; X_ptr[1] = &X01; X_ptr[2] = &X02; - X_ptr[3] = &X03; X_ptr[4] = &X04; X_ptr[5] = &X05; - X_ptr[6] = &X06; X_ptr[7] = &X07; X_ptr[8] = &X08; - X_ptr[9] = &X09; X_ptr[10] = &X10; X_ptr[11] = &X11; - X_ptr[12] = &X12; X_ptr[13] = &X13; X_ptr[14] = &X14; + X_ptr[0] = &X00; + X_ptr[1] = &X01; + X_ptr[2] = &X02; + X_ptr[3] = &X03; + X_ptr[4] = &X04; + X_ptr[5] = &X05; + X_ptr[6] = &X06; + X_ptr[7] = &X07; + X_ptr[8] = &X08; + X_ptr[9] = &X09; + X_ptr[10] = &X10; + X_ptr[11] = &X11; + X_ptr[12] = &X12; + X_ptr[13] = &X13; + X_ptr[14] = &X14; X_ptr[15] = &X15; #endif skein_assert(blk_cnt != 0); /* never call with blk_cnt == 0! */ ts[0] = ctx->h.tweak[0]; ts[1] = ctx->h.tweak[1]; - do { + do { /* * this implementation only supports 2**64 input bytes * (no carry out here) @@ -548,10 +587,10 @@ void skein_1024_process_block(struct skein_1024_ctx *ctx, const u8 *blk_ptr, ks[13] = ctx->x[13]; ks[14] = ctx->x[14]; ks[15] = ctx->x[15]; - ks[16] = ks[0] ^ ks[1] ^ ks[2] ^ ks[3] ^ - ks[4] ^ ks[5] ^ ks[6] ^ ks[7] ^ - ks[8] ^ ks[9] ^ ks[10] ^ ks[11] ^ - ks[12] ^ ks[13] ^ ks[14] ^ ks[15] ^ SKEIN_KS_PARITY; + ks[16] = ks[0] ^ ks[1] ^ ks[2] ^ ks[3] ^ + ks[4] ^ ks[5] ^ ks[6] ^ ks[7] ^ + ks[8] ^ ks[9] ^ ks[10] ^ ks[11] ^ + ks[12] ^ ks[13] ^ ks[14] ^ ks[15] ^ SKEIN_KS_PARITY; ts[2] = ts[0] ^ ts[1]; @@ -560,181 +599,195 @@ void skein_1024_process_block(struct skein_1024_ctx *ctx, const u8 *blk_ptr, debug_save_tweak(ctx); skein_show_block(BLK_BITS, &ctx->h, ctx->x, blk_ptr, w, ks, ts); - X00 = w[0] + ks[0]; /* do the first full key injection */ - X01 = w[1] + ks[1]; - X02 = w[2] + ks[2]; - X03 = w[3] + ks[3]; - X04 = w[4] + ks[4]; - X05 = w[5] + ks[5]; - X06 = w[6] + ks[6]; - X07 = w[7] + ks[7]; - X08 = w[8] + ks[8]; - X09 = w[9] + ks[9]; - X10 = w[10] + ks[10]; - X11 = w[11] + ks[11]; - X12 = w[12] + ks[12]; - X13 = w[13] + ks[13] + ts[0]; - X14 = w[14] + ks[14] + ts[1]; - X15 = w[15] + ks[15]; + X00 = w[0] + ks[0]; /* do the first full key injection */ + X01 = w[1] + ks[1]; + X02 = w[2] + ks[2]; + X03 = w[3] + ks[3]; + X04 = w[4] + ks[4]; + X05 = w[5] + ks[5]; + X06 = w[6] + ks[6]; + X07 = w[7] + ks[7]; + X08 = w[8] + ks[8]; + X09 = w[9] + ks[9]; + X10 = w[10] + ks[10]; + X11 = w[11] + ks[11]; + X12 = w[12] + ks[12]; + X13 = w[13] + ks[13] + ts[0]; + X14 = w[14] + ks[14] + ts[1]; + X15 = w[15] + ks[15]; skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INITIAL, X_ptr); -#define ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, \ - pF, ROT, r_num) \ -do { \ - X##p0 += X##p1; X##p1 = rotl_64(X##p1, ROT##_0); X##p1 ^= X##p0; \ - X##p2 += X##p3; X##p3 = rotl_64(X##p3, ROT##_1); X##p3 ^= X##p2; \ - X##p4 += X##p5; X##p5 = rotl_64(X##p5, ROT##_2); X##p5 ^= X##p4; \ - X##p6 += X##p7; X##p7 = rotl_64(X##p7, ROT##_3); X##p7 ^= X##p6; \ - X##p8 += X##p9; X##p9 = rotl_64(X##p9, ROT##_4); X##p9 ^= X##p8; \ - X##pA += X##pB; X##pB = rotl_64(X##pB, ROT##_5); X##pB ^= X##pA; \ - X##pC += X##pD; X##pD = rotl_64(X##pD, ROT##_6); X##pD ^= X##pC; \ - X##pE += X##pF; X##pF = rotl_64(X##pF, ROT##_7); X##pF ^= X##pE; \ +#define ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, \ + p8, p9, pA, pB, pC, pD, pE, pF, ROT, r_num) \ +do { \ + X##p0 += X##p1; \ + X##p1 = rotl_64(X##p1, ROT##_0); \ + X##p1 ^= X##p0; \ + X##p2 += X##p3; \ + X##p3 = rotl_64(X##p3, ROT##_1); \ + X##p3 ^= X##p2; \ + X##p4 += X##p5; \ + X##p5 = rotl_64(X##p5, ROT##_2); \ + X##p5 ^= X##p4; \ + X##p6 += X##p7; \ + X##p7 = rotl_64(X##p7, ROT##_3); \ + X##p7 ^= X##p6; \ + X##p8 += X##p9; \ + X##p9 = rotl_64(X##p9, ROT##_4); \ + X##p9 ^= X##p8; \ + X##pA += X##pB; \ + X##pB = rotl_64(X##pB, ROT##_5); \ + X##pB ^= X##pA; \ + X##pC += X##pD; \ + X##pD = rotl_64(X##pD, ROT##_6); \ + X##pD ^= X##pC; \ + X##pE += X##pF; \ + X##pF = rotl_64(X##pF, ROT##_7); \ + X##pF ^= X##pE; \ } while (0) #if SKEIN_UNROLL_1024 == 0 -#define R1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, pF, \ - ROT, rn) \ -do { \ - ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, \ - pF, ROT, rn); \ - skein_show_r_ptr(BLK_BITS, &ctx->h, rn, X_ptr); \ +#define R1024(p0, p1, p2, p3, p4, p5, p6, p7, \ + p8, p9, pA, pB, pC, pD, pE, pF, ROT, rn) \ +do { \ + ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, \ + p8, p9, pA, pB, pC, pD, pE, pF, ROT, rn); \ + skein_show_r_ptr(BLK_BITS, &ctx->h, rn, X_ptr); \ } while (0) -#define I1024(R) \ -do { \ - /* inject the key schedule value */ \ - X00 += ks[((R) + 1) % 17]; \ - X01 += ks[((R) + 2) % 17]; \ - X02 += ks[((R) + 3) % 17]; \ - X03 += ks[((R) + 4) % 17]; \ - X04 += ks[((R) + 5) % 17]; \ - X05 += ks[((R) + 6) % 17]; \ - X06 += ks[((R) + 7) % 17]; \ - X07 += ks[((R) + 8) % 17]; \ - X08 += ks[((R) + 9) % 17]; \ - X09 += ks[((R) + 10) % 17]; \ - X10 += ks[((R) + 11) % 17]; \ - X11 += ks[((R) + 12) % 17]; \ - X12 += ks[((R) + 13) % 17]; \ - X13 += ks[((R) + 14) % 17] + ts[((R) + 1) % 3]; \ - X14 += ks[((R) + 15) % 17] + ts[((R) + 2) % 3]; \ - X15 += ks[((R) + 16) % 17] + (R) + 1; \ +#define I1024(R) \ +do { \ + /* inject the key schedule value */ \ + X00 += ks[((R) + 1) % 17]; \ + X01 += ks[((R) + 2) % 17]; \ + X02 += ks[((R) + 3) % 17]; \ + X03 += ks[((R) + 4) % 17]; \ + X04 += ks[((R) + 5) % 17]; \ + X05 += ks[((R) + 6) % 17]; \ + X06 += ks[((R) + 7) % 17]; \ + X07 += ks[((R) + 8) % 17]; \ + X08 += ks[((R) + 9) % 17]; \ + X09 += ks[((R) + 10) % 17]; \ + X10 += ks[((R) + 11) % 17]; \ + X11 += ks[((R) + 12) % 17]; \ + X12 += ks[((R) + 13) % 17]; \ + X13 += ks[((R) + 14) % 17] + ts[((R) + 1) % 3]; \ + X14 += ks[((R) + 15) % 17] + ts[((R) + 2) % 3]; \ + X15 += ks[((R) + 16) % 17] + (R) + 1; \ skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ } while (0) #else /* looping version */ -#define R1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, pF, \ - ROT, rn) \ -do { \ - ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, \ - pF, ROT, rn); \ - skein_show_r_ptr(BLK_BITS, &ctx->h, 4 * (r - 1) + rn, X_ptr); \ +#define R1024(p0, p1, p2, p3, p4, p5, p6, p7, \ + p8, p9, pA, pB, pC, pD, pE, pF, ROT, rn) \ +do { \ + ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, \ + p8, p9, pA, pB, pC, pD, pE, pF, ROT, rn); \ + skein_show_r_ptr(BLK_BITS, &ctx->h, 4 * (r - 1) + rn, X_ptr); \ } while (0) -#define I1024(R) \ -do { \ - /* inject the key schedule value */ \ - X00 += ks[r + (R) + 0]; \ - X01 += ks[r + (R) + 1]; \ - X02 += ks[r + (R) + 2]; \ - X03 += ks[r + (R) + 3]; \ - X04 += ks[r + (R) + 4]; \ - X05 += ks[r + (R) + 5]; \ - X06 += ks[r + (R) + 6]; \ - X07 += ks[r + (R) + 7]; \ - X08 += ks[r + (R) + 8]; \ - X09 += ks[r + (R) + 9]; \ - X10 += ks[r + (R) + 10]; \ - X11 += ks[r + (R) + 11]; \ - X12 += ks[r + (R) + 12]; \ - X13 += ks[r + (R) + 13] + ts[r + (R) + 0]; \ - X14 += ks[r + (R) + 14] + ts[r + (R) + 1]; \ - X15 += ks[r + (R) + 15] + r + (R); \ - /* rotate key schedule */ \ - ks[r + (R) + 16] = ks[r + (R) - 1]; \ - ts[r + (R) + 2] = ts[r + (R) - 1]; \ +#define I1024(R) \ +do { \ + /* inject the key schedule value */ \ + X00 += ks[r + (R) + 0]; \ + X01 += ks[r + (R) + 1]; \ + X02 += ks[r + (R) + 2]; \ + X03 += ks[r + (R) + 3]; \ + X04 += ks[r + (R) + 4]; \ + X05 += ks[r + (R) + 5]; \ + X06 += ks[r + (R) + 6]; \ + X07 += ks[r + (R) + 7]; \ + X08 += ks[r + (R) + 8]; \ + X09 += ks[r + (R) + 9]; \ + X10 += ks[r + (R) + 10]; \ + X11 += ks[r + (R) + 11]; \ + X12 += ks[r + (R) + 12]; \ + X13 += ks[r + (R) + 13] + ts[r + (R) + 0]; \ + X14 += ks[r + (R) + 14] + ts[r + (R) + 1]; \ + X15 += ks[r + (R) + 15] + r + (R); \ + /* rotate key schedule */ \ + ks[r + (R) + 16] = ks[r + (R) - 1]; \ + ts[r + (R) + 2] = ts[r + (R) - 1]; \ skein_show_r_ptr(BLK_BITSi, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ } while (0) for (r = 1; r <= 2 * RCNT; r += 2 * SKEIN_UNROLL_1024) #endif { -#define R1024_8_ROUNDS(R) \ -do { \ - R1024(00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 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_1, 8*(R) + 2); \ - R1024(00, 07, 02, 05, 04, 03, 06, 01, 12, 15, 14, 13, 08, 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_3, 8*(R) + 4); \ - I1024(2*(R)); \ - R1024(00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 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_5, 8*(R) + 6); \ - R1024(00, 07, 02, 05, 04, 03, 06, 01, 12, 15, 14, 13, 08, 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_7, 8*(R) + 8); \ - I1024(2*(R)+1); \ +#define R1024_8_ROUNDS(R) \ +do { \ + R1024(00, 01, 02, 03, 04, 05, 06, 07, \ + 08, 09, 10, 11, 12, 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_1, 8 * (R) + 2); \ + R1024(00, 07, 02, 05, 04, 03, 06, 01, \ + 12, 15, 14, 13, 08, 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_3, 8 * (R) + 4); \ + I1024(2 * (R)); \ + R1024(00, 01, 02, 03, 04, 05, 06, 07, \ + 08, 09, 10, 11, 12, 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_5, 8 * (R) + 6); \ + R1024(00, 07, 02, 05, 04, 03, 06, 01, \ + 12, 15, 14, 13, 08, 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, I1024(2 * (R) + 1); \ } while (0) - R1024_8_ROUNDS(0); - -#define R1024_UNROLL_R(NN) \ - ((SKEIN_UNROLL_1024 == 0 && \ - SKEIN_1024_ROUNDS_TOTAL/8 > (NN)) || \ - (SKEIN_UNROLL_1024 > (NN))) - - #if R1024_UNROLL_R(1) - R1024_8_ROUNDS(1); - #endif - #if R1024_UNROLL_R(2) - R1024_8_ROUNDS(2); - #endif - #if R1024_UNROLL_R(3) - R1024_8_ROUNDS(3); - #endif - #if R1024_UNROLL_R(4) - R1024_8_ROUNDS(4); - #endif - #if R1024_UNROLL_R(5) - R1024_8_ROUNDS(5); - #endif - #if R1024_UNROLL_R(6) - R1024_8_ROUNDS(6); - #endif - #if R1024_UNROLL_R(7) - R1024_8_ROUNDS(7); - #endif - #if R1024_UNROLL_R(8) - R1024_8_ROUNDS(8); - #endif - #if R1024_UNROLL_R(9) - R1024_8_ROUNDS(9); - #endif - #if R1024_UNROLL_R(10) - R1024_8_ROUNDS(10); - #endif - #if R1024_UNROLL_R(11) - R1024_8_ROUNDS(11); - #endif - #if R1024_UNROLL_R(12) - R1024_8_ROUNDS(12); - #endif - #if R1024_UNROLL_R(13) - R1024_8_ROUNDS(13); - #endif - #if R1024_UNROLL_R(14) - R1024_8_ROUNDS(14); - #endif + R1024_8_ROUNDS(0); + +#define R1024_UNROLL_R(NN) \ + ((SKEIN_UNROLL_1024 == 0 && SKEIN_1024_ROUNDS_TOTAL/8 > (NN)) || \ + (SKEIN_UNROLL_1024 > (NN))) + +#if R1024_UNROLL_R(1) + R1024_8_ROUNDS(1); +#endif +#if R1024_UNROLL_R(2) + R1024_8_ROUNDS(2); +#endif +#if R1024_UNROLL_R(3) + R1024_8_ROUNDS(3); +#endif +#if R1024_UNROLL_R(4) + R1024_8_ROUNDS(4); +#endif +#if R1024_UNROLL_R(5) + R1024_8_ROUNDS(5); +#endif +#if R1024_UNROLL_R(6) + R1024_8_ROUNDS(6); +#endif +#if R1024_UNROLL_R(7) + R1024_8_ROUNDS(7); +#endif +#if R1024_UNROLL_R(8) + R1024_8_ROUNDS(8); +#endif +#if R1024_UNROLL_R(9) + R1024_8_ROUNDS(9); +#endif +#if R1024_UNROLL_R(10) + R1024_8_ROUNDS(10); +#endif +#if R1024_UNROLL_R(11) + R1024_8_ROUNDS(11); +#endif +#if R1024_UNROLL_R(12) + R1024_8_ROUNDS(12); +#endif +#if R1024_UNROLL_R(13) + R1024_8_ROUNDS(13); +#endif +#if R1024_UNROLL_R(14) + R1024_8_ROUNDS(14); +#endif #if (SKEIN_UNROLL_1024 > 14) #error "need more unrolling in Skein_1024_Process_Block" - #endif - } +#endif + } /* do the final "feedforward" xor, update context chaining */ ctx->x[0] = X00 ^ w[0]; @@ -766,8 +819,8 @@ do { \ #if defined(SKEIN_CODE_SIZE) || defined(SKEIN_PERF) size_t skein_1024_process_block_code_size(void) { - return ((u8 *) skein_1024_process_block_code_size) - - ((u8 *) skein_1024_process_block); + return ((u8 *)skein_1024_process_block_code_size) - + ((u8 *)skein_1024_process_block); } unsigned int skein_1024_unroll_cnt(void) { ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Fixed Conditional white space problems 2014-09-28 23:27 ` Joe Perches @ 2014-09-28 23:35 ` Eric Rost 0 siblings, 0 replies; 5+ messages in thread From: Eric Rost @ 2014-09-28 23:35 UTC (permalink / raw) To: Joe Perches Cc: Jason Cooper, Greg KH, jake, antonysaraev, devel, linux-kernel I think I stepped in it over my head. I'm going to let someone else handle this one and see if I can find something less odd. On Sun, 2014-09-28 at 16:27 -0700, Joe Perches wrote: > On Sun, 2014-09-28 at 18:53 -0400, Jason Cooper wrote: > > On Sun, Sep 28, 2014 at 06:01:01PM -0400, Greg KH wrote: > > > On Sun, Sep 28, 2014 at 04:54:26PM -0500, Eric Rost wrote: > > > > My first patch, resent to appropriate multiple addresses! > > > > > > That's great, but it doesn't belong here in the body of the changelog :) > > > > > > > This patch fixes the following checkpatch.pl Warnings: > > > > > > > > WARNING: suspect code indent for conditional statements (16, 16) > > > > + for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512) > > > > [...] > > > > + { > > > > > > > > WARNING: suspect code indent for conditional statements (16, 16) > > > > + for (r = 1; r <= 2 * RCNT; r += 2 * SKEIN_UNROLL_1024) > > > > [...] > > > > + { > > > > > > Your subject should give a clue as to what part of the kernel it > > > modifies, for this patch, it might look like: > > > staging: skein: fixed conditional... > > > > > > Care to fix that up and resend? > > > > With Greg's comments addressed, > > > > Acked-by: Jason Cooper <jason@lakedaemon.net> > > Actually, I think these are false positives due to > the odd #ifdef uses. > > Were I to try to make it more kernel style like, > I'd end up doing something like this: > > Expand multiple statements on a line > Neaten #defines > Whitespace changes and alignment > Multi-statement macros should use do {} while (0) > > --- > drivers/staging/skein/skein_block.c | 827 +++++++++++++++++++----------------- > 1 file changed, 440 insertions(+), 387 deletions(-) > > diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c > index 616364f..a4f2aef 100644 > --- a/drivers/staging/skein/skein_block.c > +++ b/drivers/staging/skein/skein_block.c > @@ -1,18 +1,18 @@ > /*********************************************************************** > -** > -** Implementation of the Skein block functions. > -** > -** Source code author: Doug Whiting, 2008. > -** > -** This algorithm and source code is released to the public domain. > -** > -** Compile-time switches: > -** > -** SKEIN_USE_ASM -- set bits (256/512/1024) to select which > -** versions use ASM code for block processing > -** [default: use C for all block sizes] > -** > -************************************************************************/ > + ** > + ** Implementation of the Skein block functions. > + ** > + ** Source code author: Doug Whiting, 2008. > + ** > + ** This algorithm and source code is released to the public domain. > + ** > + ** Compile-time switches: > + ** > + ** SKEIN_USE_ASM -- set bits (256/512/1024) to select which > + ** versions use ASM code for block processing > + ** [default: use C for all block sizes] > + ** > + ************************************************************************/ > > #include <linux/string.h> > #include "skein.h" > @@ -26,15 +26,18 @@ > #define SKEIN_LOOP 001 /* default: unroll 256 and 512, but not 1024 */ > #endif > > -#define BLK_BITS (WCNT*64) /* some useful definitions for code here */ > +#define BLK_BITS (WCNT * 64) /* some useful definitions for code here */ > #define KW_TWK_BASE (0) > #define KW_KEY_BASE (3) > #define ks (kw + KW_KEY_BASE) > #define ts (kw + KW_TWK_BASE) > > #ifdef SKEIN_DEBUG > -#define debug_save_tweak(ctx) { \ > - ctx->h.tweak[0] = ts[0]; ctx->h.tweak[1] = ts[1]; } > +#define debug_save_tweak(ctx) \ > +do { \ > + ctx->h.tweak[0] = ts[0]; \ > + ctx->h.tweak[1] = ts[1]; \ > +} while (0) > #else > #define debug_save_tweak(ctx) > #endif > @@ -43,7 +46,7 @@ > #if !(SKEIN_USE_ASM & 256) > void skein_256_process_block(struct skein_256_ctx *ctx, const u8 *blk_ptr, > size_t blk_cnt, size_t byte_cnt_add) > - { /* do it in C */ > +{ /* do it in C */ > enum { > WCNT = SKEIN_256_STATE_WORDS > }; > @@ -60,22 +63,27 @@ void skein_256_process_block(struct skein_256_ctx *ctx, const u8 *blk_ptr, > #if (RCNT % SKEIN_UNROLL_256) > #error "Invalid SKEIN_UNROLL_256" /* sanity check on unroll count */ > #endif > - size_t r; > - u64 kw[WCNT+4+RCNT*2]; /* key schedule: chaining vars + tweak + "rot"*/ > + size_t r; > + /* key schedule: chaining vars + tweak + "rot"*/ > + u64 kw[WCNT + 4 + RCNT * 2]; > #else > - u64 kw[WCNT+4]; /* key schedule words : chaining vars + tweak */ > + /* key schedule words : chaining vars + tweak */ > + u64 kw[WCNT + 4]; > #endif > - u64 X0, X1, X2, X3; /* local copy of context vars, for speed */ > - u64 w[WCNT]; /* local copy of input block */ > + u64 X0, X1, X2, X3; /* local copy of context vars, for speed */ > + u64 w[WCNT]; /* local copy of input block */ > #ifdef SKEIN_DEBUG > const u64 *X_ptr[4]; /* use for debugging (help cc put Xn in regs) */ > > - X_ptr[0] = &X0; X_ptr[1] = &X1; X_ptr[2] = &X2; X_ptr[3] = &X3; > + X_ptr[0] = &X0; > + X_ptr[1] = &X1; > + X_ptr[2] = &X2; > + X_ptr[3] = &X3; > #endif > skein_assert(blk_cnt != 0); /* never call with blk_cnt == 0! */ > ts[0] = ctx->h.tweak[0]; > ts[1] = ctx->h.tweak[1]; > - do { > + do { > /* > * this implementation only supports 2**64 input bytes > * (no carry out here) > @@ -109,118 +117,121 @@ void skein_256_process_block(struct skein_256_ctx *ctx, const u8 *blk_ptr, > > /* run the rounds */ > > -#define ROUND256(p0, p1, p2, p3, ROT, r_num) \ > -do { \ > - X##p0 += X##p1; X##p1 = rotl_64(X##p1, ROT##_0); X##p1 ^= X##p0; \ > - X##p2 += X##p3; X##p3 = rotl_64(X##p3, ROT##_1); X##p3 ^= X##p2; \ > +#define ROUND256(p0, p1, p2, p3, ROT, r_num) \ > +do { \ > + X##p0 += X##p1; \ > + X##p1 = rotl_64(X##p1, ROT##_0); \ > + X##p1 ^= X##p0; \ > + X##p2 += X##p3; \ > + X##p3 = rotl_64(X##p3, ROT##_1); X##p3 ^= X##p2; \ > } while (0) > > #if SKEIN_UNROLL_256 == 0 > -#define R256(p0, p1, p2, p3, ROT, r_num) /* fully unrolled */ \ > -do { \ > - ROUND256(p0, p1, p2, p3, ROT, r_num); \ > - skein_show_r_ptr(BLK_BITS, &ctx->h, r_num, X_ptr); \ > +#define R256(p0, p1, p2, p3, ROT, r_num) /* fully unrolled */ \ > +do { \ > + ROUND256(p0, p1, p2, p3, ROT, r_num); \ > + skein_show_r_ptr(BLK_BITS, &ctx->h, r_num, X_ptr); \ > } while (0) > > -#define I256(R) \ > -do { \ > - /* inject the key schedule value */ \ > - X0 += ks[((R)+1) % 5]; \ > - X1 += ks[((R)+2) % 5] + ts[((R)+1) % 3]; \ > - X2 += ks[((R)+3) % 5] + ts[((R)+2) % 3]; \ > - X3 += ks[((R)+4) % 5] + (R)+1; \ > +#define I256(R) \ > +do { \ > + /* inject the key schedule value */ \ > + X0 += ks[((R) + 1) % 5]; \ > + X1 += ks[((R) + 2) % 5] + ts[((R) + 1) % 3]; \ > + X2 += ks[((R) + 3) % 5] + ts[((R) + 2) % 3]; \ > + X3 += ks[((R) + 4) % 5] + (R)+1; \ > skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ > } while (0) > #else /* looping version */ > -#define R256(p0, p1, p2, p3, ROT, r_num) \ > -do { \ > - ROUND256(p0, p1, p2, p3, ROT, r_num); \ > +#define R256(p0, p1, p2, p3, ROT, r_num) \ > +do { \ > + ROUND256(p0, p1, p2, p3, ROT, r_num); \ > skein_show_r_ptr(BLK_BITS, &ctx->h, 4 * (r - 1) + r_num, X_ptr); \ > } while (0) > > -#define I256(R) \ > -do { \ > - /* inject the key schedule value */ \ > - X0 += ks[r+(R)+0]; \ > - X1 += ks[r+(R)+1] + ts[r+(R)+0]; \ > - X2 += ks[r+(R)+2] + ts[r+(R)+1]; \ > - X3 += ks[r+(R)+3] + r+(R); \ > - /* rotate key schedule */ \ > - ks[r + (R) + 4] = ks[r + (R) - 1]; \ > - ts[r + (R) + 2] = ts[r + (R) - 1]; \ > +#define I256(R) \ > +do { \ > + /* inject the key schedule value */ \ > + X0 += ks[r+(R) + 0]; \ > + X1 += ks[r+(R) + 1] + ts[r + (R) + 0]; \ > + X2 += ks[r+(R) + 2] + ts[r + (R) + 1]; \ > + X3 += ks[r+(R) + 3] + r + (R); \ > + /* rotate key schedule */ \ > + ks[r + (R) + 4] = ks[r + (R) - 1]; \ > + ts[r + (R) + 2] = ts[r + (R) - 1]; \ > skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ > } while (0) > > - for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_256) > + for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_256) > #endif > { > -#define R256_8_ROUNDS(R) \ > -do { \ > - R256(0, 1, 2, 3, R_256_0, 8 * (R) + 1); \ > - R256(0, 3, 2, 1, R_256_1, 8 * (R) + 2); \ > - R256(0, 1, 2, 3, R_256_2, 8 * (R) + 3); \ > - R256(0, 3, 2, 1, R_256_3, 8 * (R) + 4); \ > - I256(2 * (R)); \ > - R256(0, 1, 2, 3, R_256_4, 8 * (R) + 5); \ > - R256(0, 3, 2, 1, R_256_5, 8 * (R) + 6); \ > - R256(0, 1, 2, 3, R_256_6, 8 * (R) + 7); \ > - R256(0, 3, 2, 1, R_256_7, 8 * (R) + 8); \ > - I256(2 * (R) + 1); \ > +#define R256_8_ROUNDS(R) \ > +do { \ > + R256(0, 1, 2, 3, R_256_0, 8 * (R) + 1); \ > + R256(0, 3, 2, 1, R_256_1, 8 * (R) + 2); \ > + R256(0, 1, 2, 3, R_256_2, 8 * (R) + 3); \ > + R256(0, 3, 2, 1, R_256_3, 8 * (R) + 4); \ > + I256(2 * (R)); \ > + R256(0, 1, 2, 3, R_256_4, 8 * (R) + 5); \ > + R256(0, 3, 2, 1, R_256_5, 8 * (R) + 6); \ > + R256(0, 1, 2, 3, R_256_6, 8 * (R) + 7); \ > + R256(0, 3, 2, 1, R_256_7, 8 * (R) + 8); \ > + I256(2 * (R) + 1); \ > } while (0) > > - R256_8_ROUNDS(0); > + R256_8_ROUNDS(0); > > -#define R256_UNROLL_R(NN) \ > - ((SKEIN_UNROLL_256 == 0 && \ > - SKEIN_256_ROUNDS_TOTAL/8 > (NN)) || \ > +#define R256_UNROLL_R(NN) \ > + ((SKEIN_UNROLL_256 == 0 && SKEIN_256_ROUNDS_TOTAL/8 > (NN)) || \ > (SKEIN_UNROLL_256 > (NN))) > > - #if R256_UNROLL_R(1) > - R256_8_ROUNDS(1); > - #endif > - #if R256_UNROLL_R(2) > - R256_8_ROUNDS(2); > - #endif > - #if R256_UNROLL_R(3) > - R256_8_ROUNDS(3); > - #endif > - #if R256_UNROLL_R(4) > - R256_8_ROUNDS(4); > - #endif > - #if R256_UNROLL_R(5) > - R256_8_ROUNDS(5); > - #endif > - #if R256_UNROLL_R(6) > - R256_8_ROUNDS(6); > - #endif > - #if R256_UNROLL_R(7) > - R256_8_ROUNDS(7); > - #endif > - #if R256_UNROLL_R(8) > - R256_8_ROUNDS(8); > - #endif > - #if R256_UNROLL_R(9) > - R256_8_ROUNDS(9); > - #endif > - #if R256_UNROLL_R(10) > - R256_8_ROUNDS(10); > - #endif > - #if R256_UNROLL_R(11) > - R256_8_ROUNDS(11); > - #endif > - #if R256_UNROLL_R(12) > - R256_8_ROUNDS(12); > - #endif > - #if R256_UNROLL_R(13) > - R256_8_ROUNDS(13); > - #endif > - #if R256_UNROLL_R(14) > - R256_8_ROUNDS(14); > - #endif > - #if (SKEIN_UNROLL_256 > 14) > +#if R256_UNROLL_R(1) > + R256_8_ROUNDS(1); > +#endif > +#if R256_UNROLL_R(2) > + R256_8_ROUNDS(2); > +#endif > +#if R256_UNROLL_R(3) > + R256_8_ROUNDS(3); > +#endif > +#if R256_UNROLL_R(4) > + R256_8_ROUNDS(4); > +#endif > +#if R256_UNROLL_R(5) > + R256_8_ROUNDS(5); > +#endif > +#if R256_UNROLL_R(6) > + R256_8_ROUNDS(6); > +#endif > +#if R256_UNROLL_R(7) > + R256_8_ROUNDS(7); > +#endif > +#if R256_UNROLL_R(8) > + R256_8_ROUNDS(8); > +#endif > +#if R256_UNROLL_R(9) > + R256_8_ROUNDS(9); > +#endif > +#if R256_UNROLL_R(10) > + R256_8_ROUNDS(10); > +#endif > +#if R256_UNROLL_R(11) > + R256_8_ROUNDS(11); > +#endif > +#if R256_UNROLL_R(12) > + R256_8_ROUNDS(12); > +#endif > +#if R256_UNROLL_R(13) > + R256_8_ROUNDS(13); > +#endif > +#if R256_UNROLL_R(14) > + R256_8_ROUNDS(14); > +#endif > +#if (SKEIN_UNROLL_256 > 14) > #error "need more unrolling in skein_256_process_block" > - #endif > +#endif > } > + > /* do the final "feedforward" xor, update context chaining */ > ctx->x[0] = X0 ^ w[0]; > ctx->x[1] = X1 ^ w[1]; > @@ -231,6 +242,7 @@ do { \ > > ts[1] &= ~SKEIN_T1_FLAG_FIRST; > } while (--blk_cnt); > + > ctx->h.tweak[0] = ts[0]; > ctx->h.tweak[1] = ts[1]; > } > @@ -238,8 +250,8 @@ do { \ > #if defined(SKEIN_CODE_SIZE) || defined(SKEIN_PERF) > size_t skein_256_process_block_code_size(void) > { > - return ((u8 *) skein_256_process_block_code_size) - > - ((u8 *) skein_256_process_block); > + return ((u8 *)skein_256_process_block_code_size) - > + ((u8 *)skein_256_process_block); > } > unsigned int skein_256_unroll_cnt(void) > { > @@ -260,7 +272,7 @@ void skein_512_process_block(struct skein_512_ctx *ctx, const u8 *blk_ptr, > #define RCNT (SKEIN_512_ROUNDS_TOTAL/8) > > #ifdef SKEIN_LOOP /* configure how much to unroll the loop */ > -#define SKEIN_UNROLL_512 (((SKEIN_LOOP)/10)%10) > +#define SKEIN_UNROLL_512 (((SKEIN_LOOP) / 10) % 10) > #else > #define SKEIN_UNROLL_512 (0) > #endif > @@ -269,24 +281,32 @@ void skein_512_process_block(struct skein_512_ctx *ctx, const u8 *blk_ptr, > #if (RCNT % SKEIN_UNROLL_512) > #error "Invalid SKEIN_UNROLL_512" /* sanity check on unroll count */ > #endif > - size_t r; > - u64 kw[WCNT+4+RCNT*2]; /* key sched: chaining vars + tweak + "rot"*/ > + size_t r; > + /* key sched: chaining vars + tweak + "rot"*/ > + u64 kw[WCNT + 4 + RCNT * 2]; > #else > - u64 kw[WCNT+4]; /* key schedule words : chaining vars + tweak */ > + /* key schedule words : chaining vars + tweak */ > + u64 kw[WCNT + 4]; > #endif > - u64 X0, X1, X2, X3, X4, X5, X6, X7; /* local copies, for speed */ > - u64 w[WCNT]; /* local copy of input block */ > + u64 X0, X1, X2, X3, X4, X5, X6, X7; /* local copies, for speed */ > + u64 w[WCNT]; /* local copy of input block */ > #ifdef SKEIN_DEBUG > const u64 *X_ptr[8]; /* use for debugging (help cc put Xn in regs) */ > > - X_ptr[0] = &X0; X_ptr[1] = &X1; X_ptr[2] = &X2; X_ptr[3] = &X3; > - X_ptr[4] = &X4; X_ptr[5] = &X5; X_ptr[6] = &X6; X_ptr[7] = &X7; > + X_ptr[0] = &X0; > + X_ptr[1] = &X1; > + X_ptr[2] = &X2; > + X_ptr[3] = &X3; > + X_ptr[4] = &X4; > + X_ptr[5] = &X5; > + X_ptr[6] = &X6; > + X_ptr[7] = &X7; > #endif > > skein_assert(blk_cnt != 0); /* never call with blk_cnt == 0! */ > ts[0] = ctx->h.tweak[0]; > ts[1] = ctx->h.tweak[1]; > - do { > + do { > /* > * this implementation only supports 2**64 input bytes > * (no carry out here) > @@ -312,141 +332,148 @@ void skein_512_process_block(struct skein_512_ctx *ctx, const u8 *blk_ptr, > debug_save_tweak(ctx); > skein_show_block(BLK_BITS, &ctx->h, ctx->x, blk_ptr, w, ks, ts); > > - X0 = w[0] + ks[0]; /* do the first full key injection */ > - X1 = w[1] + ks[1]; > - X2 = w[2] + ks[2]; > - X3 = w[3] + ks[3]; > - X4 = w[4] + ks[4]; > - X5 = w[5] + ks[5] + ts[0]; > - X6 = w[6] + ks[6] + ts[1]; > - X7 = w[7] + ks[7]; > + X0 = w[0] + ks[0]; /* do the first full key injection */ > + X1 = w[1] + ks[1]; > + X2 = w[2] + ks[2]; > + X3 = w[3] + ks[3]; > + X4 = w[4] + ks[4]; > + X5 = w[5] + ks[5] + ts[0]; > + X6 = w[6] + ks[6] + ts[1]; > + X7 = w[7] + ks[7]; > > blk_ptr += SKEIN_512_BLOCK_BYTES; > > skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INITIAL, > X_ptr); > /* run the rounds */ > -#define ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ > -do { \ > - X##p0 += X##p1; X##p1 = rotl_64(X##p1, ROT##_0); X##p1 ^= X##p0; \ > - X##p2 += X##p3; X##p3 = rotl_64(X##p3, ROT##_1); X##p3 ^= X##p2; \ > - X##p4 += X##p5; X##p5 = rotl_64(X##p5, ROT##_2); X##p5 ^= X##p4; \ > - X##p6 += X##p7; X##p7 = rotl_64(X##p7, ROT##_3); X##p7 ^= X##p6; \ > +#define ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ > +do { \ > + X##p0 += X##p1; \ > + X##p1 = rotl_64(X##p1, ROT##_0); \ > + X##p1 ^= X##p0; \ > + X##p2 += X##p3; \ > + X##p3 = rotl_64(X##p3, ROT##_1); \ > + X##p3 ^= X##p2; \ > + X##p4 += X##p5; \ > + X##p5 = rotl_64(X##p5, ROT##_2); \ > + X##p5 ^= X##p4; \ > + X##p6 += X##p7; \ > + X##p7 = rotl_64(X##p7, ROT##_3); \ > + X##p7 ^= X##p6; \ > } while (0) > > #if SKEIN_UNROLL_512 == 0 > #define R512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) /* unrolled */ \ > -do { \ > - ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ > - skein_show_r_ptr(BLK_BITS, &ctx->h, r_num, X_ptr); \ > +do { \ > + ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num); \ > + skein_show_r_ptr(BLK_BITS, &ctx->h, r_num, X_ptr); \ > } while (0) > > -#define I512(R) \ > -do { \ > - /* inject the key schedule value */ \ > - X0 += ks[((R) + 1) % 9]; \ > - X1 += ks[((R) + 2) % 9]; \ > - X2 += ks[((R) + 3) % 9]; \ > - X3 += ks[((R) + 4) % 9]; \ > - X4 += ks[((R) + 5) % 9]; \ > - X5 += ks[((R) + 6) % 9] + ts[((R) + 1) % 3]; \ > - X6 += ks[((R) + 7) % 9] + ts[((R) + 2) % 3]; \ > - X7 += ks[((R) + 8) % 9] + (R) + 1; \ > +#define I512(R) \ > +do { \ > + /* inject the key schedule value */ \ > + X0 += ks[((R) + 1) % 9]; \ > + X1 += ks[((R) + 2) % 9]; \ > + X2 += ks[((R) + 3) % 9]; \ > + X3 += ks[((R) + 4) % 9]; \ > + X4 += ks[((R) + 5) % 9]; \ > + X5 += ks[((R) + 6) % 9] + ts[((R) + 1) % 3]; \ > + X6 += ks[((R) + 7) % 9] + ts[((R) + 2) % 3]; \ > + X7 += ks[((R) + 8) % 9] + (R) + 1; \ > skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ > } while (0) > #else /* looping version */ > -#define R512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ > -do { \ > - ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num); \ > +#define R512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num) \ > +do { \ > + ROUND512(p0, p1, p2, p3, p4, p5, p6, p7, ROT, r_num); \ > skein_show_r_ptr(BLK_BITS, &ctx->h, 4 * (r - 1) + r_num, X_ptr); \ > } while (0) > > -#define I512(R) \ > -do { \ > - /* inject the key schedule value */ \ > - X0 += ks[r + (R) + 0]; \ > - X1 += ks[r + (R) + 1]; \ > - X2 += ks[r + (R) + 2]; \ > - X3 += ks[r + (R) + 3]; \ > - X4 += ks[r + (R) + 4]; \ > - X5 += ks[r + (R) + 5] + ts[r + (R) + 0]; \ > - X6 += ks[r + (R) + 6] + ts[r + (R) + 1]; \ > - X7 += ks[r + (R) + 7] + r + (R); \ > - /* rotate key schedule */ \ > - ks[r + (R) + 8] = ks[r + (R) - 1]; \ > - ts[r + (R) + 2] = ts[r + (R) - 1]; \ > +#define I512(R) \ > +do { \ > + /* inject the key schedule value */ \ > + X0 += ks[r + (R) + 0]; \ > + X1 += ks[r + (R) + 1]; \ > + X2 += ks[r + (R) + 2]; \ > + X3 += ks[r + (R) + 3]; \ > + X4 += ks[r + (R) + 4]; \ > + X5 += ks[r + (R) + 5] + ts[r + (R) + 0]; \ > + X6 += ks[r + (R) + 6] + ts[r + (R) + 1]; \ > + X7 += ks[r + (R) + 7] + r + (R); \ > + /* rotate key schedule */ \ > + ks[r + (R) + 8] = ks[r + (R) - 1]; \ > + ts[r + (R) + 2] = ts[r + (R) - 1]; \ > skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ > } while (0) > > for (r = 1; r < 2 * RCNT; r += 2 * SKEIN_UNROLL_512) > #endif /* end of looped code definitions */ > { > -#define R512_8_ROUNDS(R) /* do 8 full rounds */ \ > -do { \ > - 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(4, 1, 6, 3, 0, 5, 2, 7, R_512_2, 8 * (R) + 3); \ > - R512(6, 1, 0, 7, 2, 5, 4, 3, R_512_3, 8 * (R) + 4); \ > - I512(2 * (R)); \ > - R512(0, 1, 2, 3, 4, 5, 6, 7, R_512_4, 8 * (R) + 5); \ > - R512(2, 1, 4, 7, 6, 5, 0, 3, R_512_5, 8 * (R) + 6); \ > - 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); \ > - I512(2 * (R) + 1); /* and key injection */ \ > +#define R512_8_ROUNDS(R) /* do 8 full rounds */ \ > +do { \ > + 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(4, 1, 6, 3, 0, 5, 2, 7, R_512_2, 8 * (R) + 3); \ > + R512(6, 1, 0, 7, 2, 5, 4, 3, R_512_3, 8 * (R) + 4); \ > + I512(2 * (R)); \ > + R512(0, 1, 2, 3, 4, 5, 6, 7, R_512_4, 8 * (R) + 5); \ > + R512(2, 1, 4, 7, 6, 5, 0, 3, R_512_5, 8 * (R) + 6); \ > + 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); \ > + I512(2 * (R) + 1); /* and key injection */ \ > } while (0) > > R512_8_ROUNDS(0); > > -#define R512_UNROLL_R(NN) \ > - ((SKEIN_UNROLL_512 == 0 && \ > - SKEIN_512_ROUNDS_TOTAL/8 > (NN)) || \ > - (SKEIN_UNROLL_512 > (NN))) > +#define R512_UNROLL_R(NN) \ > + ((SKEIN_UNROLL_512 == 0 && SKEIN_512_ROUNDS_TOTAL/8 > (NN)) || \ > + (SKEIN_UNROLL_512 > (NN))) > > - #if R512_UNROLL_R(1) > +#if R512_UNROLL_R(1) > R512_8_ROUNDS(1); > - #endif > - #if R512_UNROLL_R(2) > +#endif > +#if R512_UNROLL_R(2) > R512_8_ROUNDS(2); > - #endif > - #if R512_UNROLL_R(3) > +#endif > +#if R512_UNROLL_R(3) > R512_8_ROUNDS(3); > - #endif > - #if R512_UNROLL_R(4) > +#endif > +#if R512_UNROLL_R(4) > R512_8_ROUNDS(4); > - #endif > - #if R512_UNROLL_R(5) > +#endif > +#if R512_UNROLL_R(5) > R512_8_ROUNDS(5); > - #endif > - #if R512_UNROLL_R(6) > +#endif > +#if R512_UNROLL_R(6) > R512_8_ROUNDS(6); > - #endif > - #if R512_UNROLL_R(7) > +#endif > +#if R512_UNROLL_R(7) > R512_8_ROUNDS(7); > - #endif > - #if R512_UNROLL_R(8) > +#endif > +#if R512_UNROLL_R(8) > R512_8_ROUNDS(8); > - #endif > - #if R512_UNROLL_R(9) > +#endif > +#if R512_UNROLL_R(9) > R512_8_ROUNDS(9); > - #endif > - #if R512_UNROLL_R(10) > +#endif > +#if R512_UNROLL_R(10) > R512_8_ROUNDS(10); > - #endif > - #if R512_UNROLL_R(11) > +#endif > +#if R512_UNROLL_R(11) > R512_8_ROUNDS(11); > - #endif > - #if R512_UNROLL_R(12) > +#endif > +#if R512_UNROLL_R(12) > R512_8_ROUNDS(12); > - #endif > - #if R512_UNROLL_R(13) > +#endif > +#if R512_UNROLL_R(13) > R512_8_ROUNDS(13); > - #endif > - #if R512_UNROLL_R(14) > +#endif > +#if R512_UNROLL_R(14) > R512_8_ROUNDS(14); > - #endif > - #if (SKEIN_UNROLL_512 > 14) > +#endif > +#if (SKEIN_UNROLL_512 > 14) > #error "need more unrolling in skein_512_process_block" > - #endif > +#endif > } > > /* do the final "feedforward" xor, update context chaining */ > @@ -469,8 +496,8 @@ do { \ > #if defined(SKEIN_CODE_SIZE) || defined(SKEIN_PERF) > size_t skein_512_process_block_code_size(void) > { > - return ((u8 *) skein_512_process_block_code_size) - > - ((u8 *) skein_512_process_block); > + return ((u8 *)skein_512_process_block_code_size) - > + ((u8 *)skein_512_process_block); > } > unsigned int skein_512_unroll_cnt(void) > { > @@ -500,31 +527,43 @@ void skein_1024_process_block(struct skein_1024_ctx *ctx, const u8 *blk_ptr, > #if (RCNT % SKEIN_UNROLL_1024) > #error "Invalid SKEIN_UNROLL_1024" /* sanity check on unroll count */ > #endif > - size_t r; > - u64 kw[WCNT+4+RCNT*2]; /* key sched: chaining vars + tweak + "rot" */ > + size_t r; > + /* key sched: chaining vars + tweak + "rot" */ > + u64 kw[WCNT + 4 + RCNT * 2]; > #else > - u64 kw[WCNT+4]; /* key schedule words : chaining vars + tweak */ > + /* key schedule words : chaining vars + tweak */ > + u64 kw[WCNT + 4]; > #endif > > /* local copy of vars, for speed */ > - u64 X00, X01, X02, X03, X04, X05, X06, X07, > - X08, X09, X10, X11, X12, X13, X14, X15; > - u64 w[WCNT]; /* local copy of input block */ > + u64 X00, X01, X02, X03, X04, X05, X06, X07, > + X08, X09, X10, X11, X12, X13, X14, X15; > + u64 w[WCNT]; /* local copy of input block */ > #ifdef SKEIN_DEBUG > const u64 *X_ptr[16]; /* use for debugging (help cc put Xn in regs) */ > > - X_ptr[0] = &X00; X_ptr[1] = &X01; X_ptr[2] = &X02; > - X_ptr[3] = &X03; X_ptr[4] = &X04; X_ptr[5] = &X05; > - X_ptr[6] = &X06; X_ptr[7] = &X07; X_ptr[8] = &X08; > - X_ptr[9] = &X09; X_ptr[10] = &X10; X_ptr[11] = &X11; > - X_ptr[12] = &X12; X_ptr[13] = &X13; X_ptr[14] = &X14; > + X_ptr[0] = &X00; > + X_ptr[1] = &X01; > + X_ptr[2] = &X02; > + X_ptr[3] = &X03; > + X_ptr[4] = &X04; > + X_ptr[5] = &X05; > + X_ptr[6] = &X06; > + X_ptr[7] = &X07; > + X_ptr[8] = &X08; > + X_ptr[9] = &X09; > + X_ptr[10] = &X10; > + X_ptr[11] = &X11; > + X_ptr[12] = &X12; > + X_ptr[13] = &X13; > + X_ptr[14] = &X14; > X_ptr[15] = &X15; > #endif > > skein_assert(blk_cnt != 0); /* never call with blk_cnt == 0! */ > ts[0] = ctx->h.tweak[0]; > ts[1] = ctx->h.tweak[1]; > - do { > + do { > /* > * this implementation only supports 2**64 input bytes > * (no carry out here) > @@ -548,10 +587,10 @@ void skein_1024_process_block(struct skein_1024_ctx *ctx, const u8 *blk_ptr, > ks[13] = ctx->x[13]; > ks[14] = ctx->x[14]; > ks[15] = ctx->x[15]; > - ks[16] = ks[0] ^ ks[1] ^ ks[2] ^ ks[3] ^ > - ks[4] ^ ks[5] ^ ks[6] ^ ks[7] ^ > - ks[8] ^ ks[9] ^ ks[10] ^ ks[11] ^ > - ks[12] ^ ks[13] ^ ks[14] ^ ks[15] ^ SKEIN_KS_PARITY; > + ks[16] = ks[0] ^ ks[1] ^ ks[2] ^ ks[3] ^ > + ks[4] ^ ks[5] ^ ks[6] ^ ks[7] ^ > + ks[8] ^ ks[9] ^ ks[10] ^ ks[11] ^ > + ks[12] ^ ks[13] ^ ks[14] ^ ks[15] ^ SKEIN_KS_PARITY; > > ts[2] = ts[0] ^ ts[1]; > > @@ -560,181 +599,195 @@ void skein_1024_process_block(struct skein_1024_ctx *ctx, const u8 *blk_ptr, > debug_save_tweak(ctx); > skein_show_block(BLK_BITS, &ctx->h, ctx->x, blk_ptr, w, ks, ts); > > - X00 = w[0] + ks[0]; /* do the first full key injection */ > - X01 = w[1] + ks[1]; > - X02 = w[2] + ks[2]; > - X03 = w[3] + ks[3]; > - X04 = w[4] + ks[4]; > - X05 = w[5] + ks[5]; > - X06 = w[6] + ks[6]; > - X07 = w[7] + ks[7]; > - X08 = w[8] + ks[8]; > - X09 = w[9] + ks[9]; > - X10 = w[10] + ks[10]; > - X11 = w[11] + ks[11]; > - X12 = w[12] + ks[12]; > - X13 = w[13] + ks[13] + ts[0]; > - X14 = w[14] + ks[14] + ts[1]; > - X15 = w[15] + ks[15]; > + X00 = w[0] + ks[0]; /* do the first full key injection */ > + X01 = w[1] + ks[1]; > + X02 = w[2] + ks[2]; > + X03 = w[3] + ks[3]; > + X04 = w[4] + ks[4]; > + X05 = w[5] + ks[5]; > + X06 = w[6] + ks[6]; > + X07 = w[7] + ks[7]; > + X08 = w[8] + ks[8]; > + X09 = w[9] + ks[9]; > + X10 = w[10] + ks[10]; > + X11 = w[11] + ks[11]; > + X12 = w[12] + ks[12]; > + X13 = w[13] + ks[13] + ts[0]; > + X14 = w[14] + ks[14] + ts[1]; > + X15 = w[15] + ks[15]; > > skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INITIAL, > X_ptr); > > -#define ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, \ > - pF, ROT, r_num) \ > -do { \ > - X##p0 += X##p1; X##p1 = rotl_64(X##p1, ROT##_0); X##p1 ^= X##p0; \ > - X##p2 += X##p3; X##p3 = rotl_64(X##p3, ROT##_1); X##p3 ^= X##p2; \ > - X##p4 += X##p5; X##p5 = rotl_64(X##p5, ROT##_2); X##p5 ^= X##p4; \ > - X##p6 += X##p7; X##p7 = rotl_64(X##p7, ROT##_3); X##p7 ^= X##p6; \ > - X##p8 += X##p9; X##p9 = rotl_64(X##p9, ROT##_4); X##p9 ^= X##p8; \ > - X##pA += X##pB; X##pB = rotl_64(X##pB, ROT##_5); X##pB ^= X##pA; \ > - X##pC += X##pD; X##pD = rotl_64(X##pD, ROT##_6); X##pD ^= X##pC; \ > - X##pE += X##pF; X##pF = rotl_64(X##pF, ROT##_7); X##pF ^= X##pE; \ > +#define ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, \ > + p8, p9, pA, pB, pC, pD, pE, pF, ROT, r_num) \ > +do { \ > + X##p0 += X##p1; \ > + X##p1 = rotl_64(X##p1, ROT##_0); \ > + X##p1 ^= X##p0; \ > + X##p2 += X##p3; \ > + X##p3 = rotl_64(X##p3, ROT##_1); \ > + X##p3 ^= X##p2; \ > + X##p4 += X##p5; \ > + X##p5 = rotl_64(X##p5, ROT##_2); \ > + X##p5 ^= X##p4; \ > + X##p6 += X##p7; \ > + X##p7 = rotl_64(X##p7, ROT##_3); \ > + X##p7 ^= X##p6; \ > + X##p8 += X##p9; \ > + X##p9 = rotl_64(X##p9, ROT##_4); \ > + X##p9 ^= X##p8; \ > + X##pA += X##pB; \ > + X##pB = rotl_64(X##pB, ROT##_5); \ > + X##pB ^= X##pA; \ > + X##pC += X##pD; \ > + X##pD = rotl_64(X##pD, ROT##_6); \ > + X##pD ^= X##pC; \ > + X##pE += X##pF; \ > + X##pF = rotl_64(X##pF, ROT##_7); \ > + X##pF ^= X##pE; \ > } while (0) > > #if SKEIN_UNROLL_1024 == 0 > -#define R1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, pF, \ > - ROT, rn) \ > -do { \ > - ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, \ > - pF, ROT, rn); \ > - skein_show_r_ptr(BLK_BITS, &ctx->h, rn, X_ptr); \ > +#define R1024(p0, p1, p2, p3, p4, p5, p6, p7, \ > + p8, p9, pA, pB, pC, pD, pE, pF, ROT, rn) \ > +do { \ > + ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, \ > + p8, p9, pA, pB, pC, pD, pE, pF, ROT, rn); \ > + skein_show_r_ptr(BLK_BITS, &ctx->h, rn, X_ptr); \ > } while (0) > > -#define I1024(R) \ > -do { \ > - /* inject the key schedule value */ \ > - X00 += ks[((R) + 1) % 17]; \ > - X01 += ks[((R) + 2) % 17]; \ > - X02 += ks[((R) + 3) % 17]; \ > - X03 += ks[((R) + 4) % 17]; \ > - X04 += ks[((R) + 5) % 17]; \ > - X05 += ks[((R) + 6) % 17]; \ > - X06 += ks[((R) + 7) % 17]; \ > - X07 += ks[((R) + 8) % 17]; \ > - X08 += ks[((R) + 9) % 17]; \ > - X09 += ks[((R) + 10) % 17]; \ > - X10 += ks[((R) + 11) % 17]; \ > - X11 += ks[((R) + 12) % 17]; \ > - X12 += ks[((R) + 13) % 17]; \ > - X13 += ks[((R) + 14) % 17] + ts[((R) + 1) % 3]; \ > - X14 += ks[((R) + 15) % 17] + ts[((R) + 2) % 3]; \ > - X15 += ks[((R) + 16) % 17] + (R) + 1; \ > +#define I1024(R) \ > +do { \ > + /* inject the key schedule value */ \ > + X00 += ks[((R) + 1) % 17]; \ > + X01 += ks[((R) + 2) % 17]; \ > + X02 += ks[((R) + 3) % 17]; \ > + X03 += ks[((R) + 4) % 17]; \ > + X04 += ks[((R) + 5) % 17]; \ > + X05 += ks[((R) + 6) % 17]; \ > + X06 += ks[((R) + 7) % 17]; \ > + X07 += ks[((R) + 8) % 17]; \ > + X08 += ks[((R) + 9) % 17]; \ > + X09 += ks[((R) + 10) % 17]; \ > + X10 += ks[((R) + 11) % 17]; \ > + X11 += ks[((R) + 12) % 17]; \ > + X12 += ks[((R) + 13) % 17]; \ > + X13 += ks[((R) + 14) % 17] + ts[((R) + 1) % 3]; \ > + X14 += ks[((R) + 15) % 17] + ts[((R) + 2) % 3]; \ > + X15 += ks[((R) + 16) % 17] + (R) + 1; \ > skein_show_r_ptr(BLK_BITS, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ > } while (0) > #else /* looping version */ > -#define R1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, pF, \ > - ROT, rn) \ > -do { \ > - ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, pA, pB, pC, pD, pE, \ > - pF, ROT, rn); \ > - skein_show_r_ptr(BLK_BITS, &ctx->h, 4 * (r - 1) + rn, X_ptr); \ > +#define R1024(p0, p1, p2, p3, p4, p5, p6, p7, \ > + p8, p9, pA, pB, pC, pD, pE, pF, ROT, rn) \ > +do { \ > + ROUND1024(p0, p1, p2, p3, p4, p5, p6, p7, \ > + p8, p9, pA, pB, pC, pD, pE, pF, ROT, rn); \ > + skein_show_r_ptr(BLK_BITS, &ctx->h, 4 * (r - 1) + rn, X_ptr); \ > } while (0) > > -#define I1024(R) \ > -do { \ > - /* inject the key schedule value */ \ > - X00 += ks[r + (R) + 0]; \ > - X01 += ks[r + (R) + 1]; \ > - X02 += ks[r + (R) + 2]; \ > - X03 += ks[r + (R) + 3]; \ > - X04 += ks[r + (R) + 4]; \ > - X05 += ks[r + (R) + 5]; \ > - X06 += ks[r + (R) + 6]; \ > - X07 += ks[r + (R) + 7]; \ > - X08 += ks[r + (R) + 8]; \ > - X09 += ks[r + (R) + 9]; \ > - X10 += ks[r + (R) + 10]; \ > - X11 += ks[r + (R) + 11]; \ > - X12 += ks[r + (R) + 12]; \ > - X13 += ks[r + (R) + 13] + ts[r + (R) + 0]; \ > - X14 += ks[r + (R) + 14] + ts[r + (R) + 1]; \ > - X15 += ks[r + (R) + 15] + r + (R); \ > - /* rotate key schedule */ \ > - ks[r + (R) + 16] = ks[r + (R) - 1]; \ > - ts[r + (R) + 2] = ts[r + (R) - 1]; \ > +#define I1024(R) \ > +do { \ > + /* inject the key schedule value */ \ > + X00 += ks[r + (R) + 0]; \ > + X01 += ks[r + (R) + 1]; \ > + X02 += ks[r + (R) + 2]; \ > + X03 += ks[r + (R) + 3]; \ > + X04 += ks[r + (R) + 4]; \ > + X05 += ks[r + (R) + 5]; \ > + X06 += ks[r + (R) + 6]; \ > + X07 += ks[r + (R) + 7]; \ > + X08 += ks[r + (R) + 8]; \ > + X09 += ks[r + (R) + 9]; \ > + X10 += ks[r + (R) + 10]; \ > + X11 += ks[r + (R) + 11]; \ > + X12 += ks[r + (R) + 12]; \ > + X13 += ks[r + (R) + 13] + ts[r + (R) + 0]; \ > + X14 += ks[r + (R) + 14] + ts[r + (R) + 1]; \ > + X15 += ks[r + (R) + 15] + r + (R); \ > + /* rotate key schedule */ \ > + ks[r + (R) + 16] = ks[r + (R) - 1]; \ > + ts[r + (R) + 2] = ts[r + (R) - 1]; \ > skein_show_r_ptr(BLK_BITSi, &ctx->h, SKEIN_RND_KEY_INJECT, X_ptr); \ > } while (0) > > for (r = 1; r <= 2 * RCNT; r += 2 * SKEIN_UNROLL_1024) > #endif > { > -#define R1024_8_ROUNDS(R) \ > -do { \ > - R1024(00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 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_1, 8*(R) + 2); \ > - R1024(00, 07, 02, 05, 04, 03, 06, 01, 12, 15, 14, 13, 08, 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_3, 8*(R) + 4); \ > - I1024(2*(R)); \ > - R1024(00, 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, 12, 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_5, 8*(R) + 6); \ > - R1024(00, 07, 02, 05, 04, 03, 06, 01, 12, 15, 14, 13, 08, 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_7, 8*(R) + 8); \ > - I1024(2*(R)+1); \ > +#define R1024_8_ROUNDS(R) \ > +do { \ > + R1024(00, 01, 02, 03, 04, 05, 06, 07, \ > + 08, 09, 10, 11, 12, 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_1, 8 * (R) + 2); \ > + R1024(00, 07, 02, 05, 04, 03, 06, 01, \ > + 12, 15, 14, 13, 08, 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_3, 8 * (R) + 4); \ > + I1024(2 * (R)); \ > + R1024(00, 01, 02, 03, 04, 05, 06, 07, \ > + 08, 09, 10, 11, 12, 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_5, 8 * (R) + 6); \ > + R1024(00, 07, 02, 05, 04, 03, 06, 01, \ > + 12, 15, 14, 13, 08, 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, I1024(2 * (R) + 1); \ > } while (0) > > - R1024_8_ROUNDS(0); > - > -#define R1024_UNROLL_R(NN) \ > - ((SKEIN_UNROLL_1024 == 0 && \ > - SKEIN_1024_ROUNDS_TOTAL/8 > (NN)) || \ > - (SKEIN_UNROLL_1024 > (NN))) > - > - #if R1024_UNROLL_R(1) > - R1024_8_ROUNDS(1); > - #endif > - #if R1024_UNROLL_R(2) > - R1024_8_ROUNDS(2); > - #endif > - #if R1024_UNROLL_R(3) > - R1024_8_ROUNDS(3); > - #endif > - #if R1024_UNROLL_R(4) > - R1024_8_ROUNDS(4); > - #endif > - #if R1024_UNROLL_R(5) > - R1024_8_ROUNDS(5); > - #endif > - #if R1024_UNROLL_R(6) > - R1024_8_ROUNDS(6); > - #endif > - #if R1024_UNROLL_R(7) > - R1024_8_ROUNDS(7); > - #endif > - #if R1024_UNROLL_R(8) > - R1024_8_ROUNDS(8); > - #endif > - #if R1024_UNROLL_R(9) > - R1024_8_ROUNDS(9); > - #endif > - #if R1024_UNROLL_R(10) > - R1024_8_ROUNDS(10); > - #endif > - #if R1024_UNROLL_R(11) > - R1024_8_ROUNDS(11); > - #endif > - #if R1024_UNROLL_R(12) > - R1024_8_ROUNDS(12); > - #endif > - #if R1024_UNROLL_R(13) > - R1024_8_ROUNDS(13); > - #endif > - #if R1024_UNROLL_R(14) > - R1024_8_ROUNDS(14); > - #endif > + R1024_8_ROUNDS(0); > + > +#define R1024_UNROLL_R(NN) \ > + ((SKEIN_UNROLL_1024 == 0 && SKEIN_1024_ROUNDS_TOTAL/8 > (NN)) || \ > + (SKEIN_UNROLL_1024 > (NN))) > + > +#if R1024_UNROLL_R(1) > + R1024_8_ROUNDS(1); > +#endif > +#if R1024_UNROLL_R(2) > + R1024_8_ROUNDS(2); > +#endif > +#if R1024_UNROLL_R(3) > + R1024_8_ROUNDS(3); > +#endif > +#if R1024_UNROLL_R(4) > + R1024_8_ROUNDS(4); > +#endif > +#if R1024_UNROLL_R(5) > + R1024_8_ROUNDS(5); > +#endif > +#if R1024_UNROLL_R(6) > + R1024_8_ROUNDS(6); > +#endif > +#if R1024_UNROLL_R(7) > + R1024_8_ROUNDS(7); > +#endif > +#if R1024_UNROLL_R(8) > + R1024_8_ROUNDS(8); > +#endif > +#if R1024_UNROLL_R(9) > + R1024_8_ROUNDS(9); > +#endif > +#if R1024_UNROLL_R(10) > + R1024_8_ROUNDS(10); > +#endif > +#if R1024_UNROLL_R(11) > + R1024_8_ROUNDS(11); > +#endif > +#if R1024_UNROLL_R(12) > + R1024_8_ROUNDS(12); > +#endif > +#if R1024_UNROLL_R(13) > + R1024_8_ROUNDS(13); > +#endif > +#if R1024_UNROLL_R(14) > + R1024_8_ROUNDS(14); > +#endif > #if (SKEIN_UNROLL_1024 > 14) > #error "need more unrolling in Skein_1024_Process_Block" > - #endif > - } > +#endif > + } > /* do the final "feedforward" xor, update context chaining */ > > ctx->x[0] = X00 ^ w[0]; > @@ -766,8 +819,8 @@ do { \ > #if defined(SKEIN_CODE_SIZE) || defined(SKEIN_PERF) > size_t skein_1024_process_block_code_size(void) > { > - return ((u8 *) skein_1024_process_block_code_size) - > - ((u8 *) skein_1024_process_block); > + return ((u8 *)skein_1024_process_block_code_size) - > + ((u8 *)skein_1024_process_block); > } > unsigned int skein_1024_unroll_cnt(void) > { > > ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-28 23:35 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-09-28 21:54 [PATCH] Fixed Conditional white space problems Eric Rost 2014-09-28 22:01 ` Greg KH 2014-09-28 22:53 ` Jason Cooper 2014-09-28 23:27 ` Joe Perches 2014-09-28 23:35 ` Eric Rost
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox