Commit 9310e567 authored by Walt Feasel's avatar Walt Feasel Committed by Greg Kroah-Hartman

staging: skein: threefish_block.c Remove blank lines

Make suggested checkpatch modification for

CHECK: Please don't use multiple blank lines

Acked-by: Jason Cooper <jason@lakedaemon.net
Signed-off-by: default avatarWalt Feasel <waltfeasel@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f9f6927
...@@ -64,7 +64,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -64,7 +64,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 += b1; b2 += b1;
b1 = rol64(b1, 32) ^ b2; b1 = rol64(b1, 32) ^ b2;
b1 += k3 + t2; b1 += k3 + t2;
b0 += b1 + k2; b0 += b1 + k2;
b1 = rol64(b1, 14) ^ b0; b1 = rol64(b1, 14) ^ b0;
...@@ -117,7 +116,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -117,7 +116,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 += b1; b2 += b1;
b1 = rol64(b1, 32) ^ b2; b1 = rol64(b1, 32) ^ b2;
b1 += k0 + t1; b1 += k0 + t1;
b0 += b1 + k4; b0 += b1 + k4;
b1 = rol64(b1, 14) ^ b0; b1 = rol64(b1, 14) ^ b0;
...@@ -170,7 +168,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -170,7 +168,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 += b1; b2 += b1;
b1 = rol64(b1, 32) ^ b2; b1 = rol64(b1, 32) ^ b2;
b1 += k2 + t0; b1 += k2 + t0;
b0 += b1 + k1; b0 += b1 + k1;
b1 = rol64(b1, 14) ^ b0; b1 = rol64(b1, 14) ^ b0;
...@@ -223,7 +220,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -223,7 +220,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 += b1; b2 += b1;
b1 = rol64(b1, 32) ^ b2; b1 = rol64(b1, 32) ^ b2;
b1 += k4 + t2; b1 += k4 + t2;
b0 += b1 + k3; b0 += b1 + k3;
b1 = rol64(b1, 14) ^ b0; b1 = rol64(b1, 14) ^ b0;
...@@ -276,7 +272,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -276,7 +272,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 += b1; b2 += b1;
b1 = rol64(b1, 32) ^ b2; b1 = rol64(b1, 32) ^ b2;
b1 += k1 + t1; b1 += k1 + t1;
b0 += b1 + k0; b0 += b1 + k0;
b1 = rol64(b1, 14) ^ b0; b1 = rol64(b1, 14) ^ b0;
...@@ -329,7 +324,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -329,7 +324,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 += b1; b2 += b1;
b1 = rol64(b1, 32) ^ b2; b1 = rol64(b1, 32) ^ b2;
b1 += k3 + t0; b1 += k3 + t0;
b0 += b1 + k2; b0 += b1 + k2;
b1 = rol64(b1, 14) ^ b0; b1 = rol64(b1, 14) ^ b0;
...@@ -382,7 +376,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -382,7 +376,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 += b1; b2 += b1;
b1 = rol64(b1, 32) ^ b2; b1 = rol64(b1, 32) ^ b2;
b1 += k0 + t2; b1 += k0 + t2;
b0 += b1 + k4; b0 += b1 + k4;
b1 = rol64(b1, 14) ^ b0; b1 = rol64(b1, 14) ^ b0;
...@@ -435,7 +428,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -435,7 +428,6 @@ void threefish_encrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 += b1; b2 += b1;
b1 = rol64(b1, 32) ^ b2; b1 = rol64(b1, 32) ^ b2;
b1 += k2 + t1; b1 += k2 + t1;
b0 += b1 + k1; b0 += b1 + k1;
b1 = rol64(b1, 14) ^ b0; b1 = rol64(b1, 14) ^ b0;
...@@ -579,7 +571,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -579,7 +571,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 -= b3 + k3 + t2; b2 -= b3 + k3 + t2;
b3 -= k4 + 16; b3 -= k4 + 16;
tmp = b3 ^ b0; tmp = b3 ^ b0;
b3 = ror64(tmp, 32); b3 = ror64(tmp, 32);
b0 -= b3; b0 -= b3;
...@@ -648,7 +639,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -648,7 +639,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 -= b3 + k1 + t0; b2 -= b3 + k1 + t0;
b3 -= k2 + 14; b3 -= k2 + 14;
tmp = b3 ^ b0; tmp = b3 ^ b0;
b3 = ror64(tmp, 32); b3 = ror64(tmp, 32);
b0 -= b3; b0 -= b3;
...@@ -717,7 +707,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -717,7 +707,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 -= b3 + k4 + t1; b2 -= b3 + k4 + t1;
b3 -= k0 + 12; b3 -= k0 + 12;
tmp = b3 ^ b0; tmp = b3 ^ b0;
b3 = ror64(tmp, 32); b3 = ror64(tmp, 32);
b0 -= b3; b0 -= b3;
...@@ -786,7 +775,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -786,7 +775,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 -= b3 + k2 + t2; b2 -= b3 + k2 + t2;
b3 -= k3 + 10; b3 -= k3 + 10;
tmp = b3 ^ b0; tmp = b3 ^ b0;
b3 = ror64(tmp, 32); b3 = ror64(tmp, 32);
b0 -= b3; b0 -= b3;
...@@ -855,7 +843,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -855,7 +843,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 -= b3 + k0 + t0; b2 -= b3 + k0 + t0;
b3 -= k1 + 8; b3 -= k1 + 8;
tmp = b3 ^ b0; tmp = b3 ^ b0;
b3 = ror64(tmp, 32); b3 = ror64(tmp, 32);
b0 -= b3; b0 -= b3;
...@@ -924,7 +911,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -924,7 +911,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 -= b3 + k3 + t1; b2 -= b3 + k3 + t1;
b3 -= k4 + 6; b3 -= k4 + 6;
tmp = b3 ^ b0; tmp = b3 ^ b0;
b3 = ror64(tmp, 32); b3 = ror64(tmp, 32);
b0 -= b3; b0 -= b3;
...@@ -993,7 +979,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -993,7 +979,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 -= b3 + k1 + t2; b2 -= b3 + k1 + t2;
b3 -= k2 + 4; b3 -= k2 + 4;
tmp = b3 ^ b0; tmp = b3 ^ b0;
b3 = ror64(tmp, 32); b3 = ror64(tmp, 32);
b0 -= b3; b0 -= b3;
...@@ -1062,7 +1047,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input, ...@@ -1062,7 +1047,6 @@ void threefish_decrypt_256(struct threefish_key *key_ctx, u64 *input,
b2 -= b3 + k4 + t0; b2 -= b3 + k4 + t0;
b3 -= k0 + 2; b3 -= k0 + 2;
tmp = b3 ^ b0; tmp = b3 ^ b0;
b3 = ror64(tmp, 32); b3 = ror64(tmp, 32);
b0 -= b3; b0 -= b3;
......
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