Commit 5b05c1e2 authored by Manu Kumar's avatar Manu Kumar Committed by Greg Kroah-Hartman

staging: skein: cleanup: Fixed operator whitespace

added operator white space and parentheses for readability
Signed-off-by: default avatarManu Kumar <maraku@gmx.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a28e32e0
...@@ -230,8 +230,8 @@ int skein_256_final(struct skein_256_ctx *ctx, u8 *hash_val) ...@@ -230,8 +230,8 @@ int skein_256_final(struct skein_256_ctx *ctx, u8 *hash_val)
if (n >= SKEIN_256_BLOCK_BYTES) if (n >= SKEIN_256_BLOCK_BYTES)
n = SKEIN_256_BLOCK_BYTES; n = SKEIN_256_BLOCK_BYTES;
/* "output" the ctr mode bytes */ /* "output" the ctr mode bytes */
skein_put64_lsb_first(hash_val + i * SKEIN_256_BLOCK_BYTES, skein_put64_lsb_first(hash_val + (i * SKEIN_256_BLOCK_BYTES),
ctx->x, n); ctx->x, n);
/* restore the counter mode key for next time */ /* restore the counter mode key for next time */
memcpy(ctx->x, x, sizeof(x)); memcpy(ctx->x, x, sizeof(x));
} }
...@@ -457,8 +457,8 @@ int skein_512_final(struct skein_512_ctx *ctx, u8 *hash_val) ...@@ -457,8 +457,8 @@ int skein_512_final(struct skein_512_ctx *ctx, u8 *hash_val)
if (n >= SKEIN_512_BLOCK_BYTES) if (n >= SKEIN_512_BLOCK_BYTES)
n = SKEIN_512_BLOCK_BYTES; n = SKEIN_512_BLOCK_BYTES;
/* "output" the ctr mode bytes */ /* "output" the ctr mode bytes */
skein_put64_lsb_first(hash_val + i * SKEIN_512_BLOCK_BYTES, skein_put64_lsb_first(hash_val + (i * SKEIN_512_BLOCK_BYTES),
ctx->x, n); ctx->x, n);
/* restore the counter mode key for next time */ /* restore the counter mode key for next time */
memcpy(ctx->x, x, sizeof(x)); memcpy(ctx->x, x, sizeof(x));
} }
...@@ -679,8 +679,8 @@ int skein_1024_final(struct skein_1024_ctx *ctx, u8 *hash_val) ...@@ -679,8 +679,8 @@ int skein_1024_final(struct skein_1024_ctx *ctx, u8 *hash_val)
if (n >= SKEIN_1024_BLOCK_BYTES) if (n >= SKEIN_1024_BLOCK_BYTES)
n = SKEIN_1024_BLOCK_BYTES; n = SKEIN_1024_BLOCK_BYTES;
/* "output" the ctr mode bytes */ /* "output" the ctr mode bytes */
skein_put64_lsb_first(hash_val + i * SKEIN_1024_BLOCK_BYTES, skein_put64_lsb_first(hash_val + (i * SKEIN_1024_BLOCK_BYTES),
ctx->x, n); ctx->x, n);
/* restore the counter mode key for next time */ /* restore the counter mode key for next time */
memcpy(ctx->x, x, sizeof(x)); memcpy(ctx->x, x, sizeof(x));
} }
...@@ -786,8 +786,8 @@ int skein_256_output(struct skein_256_ctx *ctx, u8 *hash_val) ...@@ -786,8 +786,8 @@ int skein_256_output(struct skein_256_ctx *ctx, u8 *hash_val)
if (n >= SKEIN_256_BLOCK_BYTES) if (n >= SKEIN_256_BLOCK_BYTES)
n = SKEIN_256_BLOCK_BYTES; n = SKEIN_256_BLOCK_BYTES;
/* "output" the ctr mode bytes */ /* "output" the ctr mode bytes */
skein_put64_lsb_first(hash_val + i * SKEIN_256_BLOCK_BYTES, skein_put64_lsb_first(hash_val + (i * SKEIN_256_BLOCK_BYTES),
ctx->x, n); ctx->x, n);
/* restore the counter mode key for next time */ /* restore the counter mode key for next time */
memcpy(ctx->x, x, sizeof(x)); memcpy(ctx->x, x, sizeof(x));
} }
...@@ -823,8 +823,8 @@ int skein_512_output(struct skein_512_ctx *ctx, u8 *hash_val) ...@@ -823,8 +823,8 @@ int skein_512_output(struct skein_512_ctx *ctx, u8 *hash_val)
if (n >= SKEIN_512_BLOCK_BYTES) if (n >= SKEIN_512_BLOCK_BYTES)
n = SKEIN_512_BLOCK_BYTES; n = SKEIN_512_BLOCK_BYTES;
/* "output" the ctr mode bytes */ /* "output" the ctr mode bytes */
skein_put64_lsb_first(hash_val + i * SKEIN_512_BLOCK_BYTES, skein_put64_lsb_first(hash_val + (i * SKEIN_512_BLOCK_BYTES),
ctx->x, n); ctx->x, n);
/* restore the counter mode key for next time */ /* restore the counter mode key for next time */
memcpy(ctx->x, x, sizeof(x)); memcpy(ctx->x, x, sizeof(x));
} }
...@@ -860,8 +860,8 @@ int skein_1024_output(struct skein_1024_ctx *ctx, u8 *hash_val) ...@@ -860,8 +860,8 @@ int skein_1024_output(struct skein_1024_ctx *ctx, u8 *hash_val)
if (n >= SKEIN_1024_BLOCK_BYTES) if (n >= SKEIN_1024_BLOCK_BYTES)
n = SKEIN_1024_BLOCK_BYTES; n = SKEIN_1024_BLOCK_BYTES;
/* "output" the ctr mode bytes */ /* "output" the ctr mode bytes */
skein_put64_lsb_first(hash_val + i * SKEIN_1024_BLOCK_BYTES, skein_put64_lsb_first(hash_val + (i * SKEIN_1024_BLOCK_BYTES),
ctx->x, n); ctx->x, n);
/* restore the counter mode key for next time */ /* restore the counter mode key for next time */
memcpy(ctx->x, x, sizeof(x)); memcpy(ctx->x, x, sizeof(x));
} }
......
...@@ -326,10 +326,10 @@ ...@@ -326,10 +326,10 @@
R1024(00, 09, 02, 13, 06, 11, 04, 15, 10, 07, 12, 03, 14, \ R1024(00, 09, 02, 13, 06, 11, 04, 15, 10, 07, 12, 03, 14, \
05, 08, 01, 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, \ R1024(00, 07, 02, 05, 04, 03, 06, 01, 12, 15, 14, 13, 08, \
11, 10, 09, 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, \ R1024(00, 15, 02, 11, 06, 13, 04, 09, 14, 01, 08, 05, 10, \
03, 12, 07, 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) \
...@@ -353,7 +353,7 @@ void skein_256_process_block(struct skein_256_ctx *ctx, const u8 *blk_ptr, ...@@ -353,7 +353,7 @@ void skein_256_process_block(struct skein_256_ctx *ctx, const u8 *blk_ptr,
size_t r; size_t r;
#if SKEIN_UNROLL_256 #if SKEIN_UNROLL_256
/* key schedule: chaining vars + tweak + "rot"*/ /* key schedule: chaining vars + tweak + "rot"*/
u64 kw[WCNT + 4 + RCNT * 2]; u64 kw[WCNT + 4 + (RCNT * 2)];
#else #else
/* key schedule words : chaining vars + tweak */ /* key schedule words : chaining vars + tweak */
u64 kw[WCNT + 4]; u64 kw[WCNT + 4];
...@@ -635,7 +635,7 @@ void skein_1024_process_block(struct skein_1024_ctx *ctx, const u8 *blk_ptr, ...@@ -635,7 +635,7 @@ void skein_1024_process_block(struct skein_1024_ctx *ctx, const u8 *blk_ptr,
size_t r; size_t r;
#if (SKEIN_UNROLL_1024 != 0) #if (SKEIN_UNROLL_1024 != 0)
/* key sched: chaining vars + tweak + "rot" */ /* key sched: chaining vars + tweak + "rot" */
u64 kw[WCNT + 4 + RCNT * 2]; u64 kw[WCNT + 4 + (RCNT * 2)];
#else #else
/* key schedule words : chaining vars + tweak */ /* key schedule words : chaining vars + tweak */
u64 kw[WCNT + 4]; u64 kw[WCNT + 4];
......
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