From 7963a292c6a860dc6dde28864ba6832e3048b9b2 Mon Sep 17 00:00:00 2001 From: Alexander Saprykin Date: Mon, 2 Oct 2023 09:16:26 +0200 Subject: [PATCH] Remove redundant semi-colons in crypto hashes --- src/pcryptohash-gost3411.c | 80 +++++++++--------- src/pcryptohash-sha1.c | 166 ++++++++++++++++++------------------- src/pcryptohash-sha2-256.c | 32 +++---- src/pcryptohash-sha2-512.c | 16 ++-- src/pcryptohash.c | 22 ++--- 5 files changed, 158 insertions(+), 158 deletions(-) diff --git a/src/pcryptohash-gost3411.c b/src/pcryptohash-gost3411.c index 3b7a0e2..471c5bb 100644 --- a/src/pcryptohash-gost3411.c +++ b/src/pcryptohash-gost3411.c @@ -104,41 +104,41 @@ static void pp_crypto_hash_gost3411_process (PHashGOST3411 *ctx, const puint32 d \ memcpy (N, data, 8); \ \ - P_GOST_28147_ROUND (N, (key)[0]); \ - P_GOST_28147_ROUND (N, (key)[1]); \ - P_GOST_28147_ROUND (N, (key)[2]); \ - P_GOST_28147_ROUND (N, (key)[3]); \ - P_GOST_28147_ROUND (N, (key)[4]); \ - P_GOST_28147_ROUND (N, (key)[5]); \ - P_GOST_28147_ROUND (N, (key)[6]); \ - P_GOST_28147_ROUND (N, (key)[7]); \ + P_GOST_28147_ROUND (N, (key)[0]) \ + P_GOST_28147_ROUND (N, (key)[1]) \ + P_GOST_28147_ROUND (N, (key)[2]) \ + P_GOST_28147_ROUND (N, (key)[3]) \ + P_GOST_28147_ROUND (N, (key)[4]) \ + P_GOST_28147_ROUND (N, (key)[5]) \ + P_GOST_28147_ROUND (N, (key)[6]) \ + P_GOST_28147_ROUND (N, (key)[7]) \ \ - P_GOST_28147_ROUND (N, (key)[0]); \ - P_GOST_28147_ROUND (N, (key)[1]); \ - P_GOST_28147_ROUND (N, (key)[2]); \ - P_GOST_28147_ROUND (N, (key)[3]); \ - P_GOST_28147_ROUND (N, (key)[4]); \ - P_GOST_28147_ROUND (N, (key)[5]); \ - P_GOST_28147_ROUND (N, (key)[6]); \ - P_GOST_28147_ROUND (N, (key)[7]); \ + P_GOST_28147_ROUND (N, (key)[0]) \ + P_GOST_28147_ROUND (N, (key)[1]) \ + P_GOST_28147_ROUND (N, (key)[2]) \ + P_GOST_28147_ROUND (N, (key)[3]) \ + P_GOST_28147_ROUND (N, (key)[4]) \ + P_GOST_28147_ROUND (N, (key)[5]) \ + P_GOST_28147_ROUND (N, (key)[6]) \ + P_GOST_28147_ROUND (N, (key)[7]) \ \ - P_GOST_28147_ROUND (N, (key)[0]); \ - P_GOST_28147_ROUND (N, (key)[1]); \ - P_GOST_28147_ROUND (N, (key)[2]); \ - P_GOST_28147_ROUND (N, (key)[3]); \ - P_GOST_28147_ROUND (N, (key)[4]); \ - P_GOST_28147_ROUND (N, (key)[5]); \ - P_GOST_28147_ROUND (N, (key)[6]); \ - P_GOST_28147_ROUND (N, (key)[7]); \ + P_GOST_28147_ROUND (N, (key)[0]) \ + P_GOST_28147_ROUND (N, (key)[1]) \ + P_GOST_28147_ROUND (N, (key)[2]) \ + P_GOST_28147_ROUND (N, (key)[3]) \ + P_GOST_28147_ROUND (N, (key)[4]) \ + P_GOST_28147_ROUND (N, (key)[5]) \ + P_GOST_28147_ROUND (N, (key)[6]) \ + P_GOST_28147_ROUND (N, (key)[7]) \ \ - P_GOST_28147_ROUND (N, (key)[7]); \ - P_GOST_28147_ROUND (N, (key)[6]); \ - P_GOST_28147_ROUND (N, (key)[5]); \ - P_GOST_28147_ROUND (N, (key)[4]); \ - P_GOST_28147_ROUND (N, (key)[3]); \ - P_GOST_28147_ROUND (N, (key)[2]); \ - P_GOST_28147_ROUND (N, (key)[1]); \ - P_GOST_28147_ROUND (N, (key)[0]); \ + P_GOST_28147_ROUND (N, (key)[7]) \ + P_GOST_28147_ROUND (N, (key)[6]) \ + P_GOST_28147_ROUND (N, (key)[5]) \ + P_GOST_28147_ROUND (N, (key)[4]) \ + P_GOST_28147_ROUND (N, (key)[3]) \ + P_GOST_28147_ROUND (N, (key)[2]) \ + P_GOST_28147_ROUND (N, (key)[1]) \ + P_GOST_28147_ROUND (N, (key)[0]) \ \ (out)[0] = N[1]; \ (out)[1] = N[0]; \ @@ -236,7 +236,7 @@ static void pp_crypto_hash_gost3411_process (PHashGOST3411 *ctx, W[6] = U[6] ^ V[6]; W[7] = U[7] ^ V[7]; - P_GOST_3411_P (W, K[0]); + P_GOST_3411_P (W, K[0]) /* Generate second key: P (A (U) xor A^2 (V)) */ W[0] = U[2] ^ V[4]; @@ -248,7 +248,7 @@ static void pp_crypto_hash_gost3411_process (PHashGOST3411 *ctx, W[6] = (U[0] ^= U[2]) ^ (V[2] ^= V[4]); W[7] = (U[1] ^= U[3]) ^ (V[3] ^= V[5]); - P_GOST_3411_P (W, K[1]); + P_GOST_3411_P (W, K[1]) /* Generate third key: P ((A^2 (U) + C3) xor A^4 (V)) */ /* C3 = FF00FFFF 000000FF FF0000FF 00FFFF00 00FF00FF 00FF00FF FF00FF00 FF00FF00 */ @@ -270,7 +270,7 @@ static void pp_crypto_hash_gost3411_process (PHashGOST3411 *ctx, W[5] = U[1] ^ (V[5] ^= V[7]); W[7] = U[3] ^ (V[7] ^= V[1]); - P_GOST_3411_P (W, K[2]); + P_GOST_3411_P (W, K[2]) /* Generate forth key: P (A (A^2 (U) xor C3) xor A^6 (V)) */ W[0] = U[6] ^ V[4]; @@ -282,13 +282,13 @@ static void pp_crypto_hash_gost3411_process (PHashGOST3411 *ctx, W[6] = (U[4] ^= U[6]) ^ (V[2] ^= V[4]); W[7] = (U[5] ^= U[7]) ^ (V[3] ^= V[5]); - P_GOST_3411_P (W, K[3]); + P_GOST_3411_P (W, K[3]) /* Perform GOST 28147-89 encryption */ - P_GOST_28147_E (ctx->hash, K[0], S); - P_GOST_28147_E (ctx->hash + 2, K[1], S + 2); - P_GOST_28147_E (ctx->hash + 4, K[2], S + 4); - P_GOST_28147_E (ctx->hash + 6, K[3], S + 6); + P_GOST_28147_E (ctx->hash, K[0], S) + P_GOST_28147_E (ctx->hash + 2, K[1], S + 2) + P_GOST_28147_E (ctx->hash + 4, K[2], S + 4) + P_GOST_28147_E (ctx->hash + 6, K[3], S + 6) /* Step hash function: H (M, Hprev) = PSI^61 (Hprev xor PSI (M xor PSI^12 (S))) */ diff --git a/src/pcryptohash-sha1.c b/src/pcryptohash-sha1.c index 2dd0cc7..56ffed4 100644 --- a/src/pcryptohash-sha1.c +++ b/src/pcryptohash-sha1.c @@ -131,89 +131,89 @@ pp_crypto_hash_sha1_process (PHashSHA1 *ctx, D = ctx->hash[3]; E = ctx->hash[4]; - P_SHA1_ROUND_0 (A, B, C, D, E, W[0]); - P_SHA1_ROUND_0 (E, A, B, C, D, W[1]); - P_SHA1_ROUND_0 (D, E, A, B, C, W[2]); - P_SHA1_ROUND_0 (C, D, E, A, B, W[3]); - P_SHA1_ROUND_0 (B, C, D, E, A, W[4]); - P_SHA1_ROUND_0 (A, B, C, D, E, W[5]); - P_SHA1_ROUND_0 (E, A, B, C, D, W[6]); - P_SHA1_ROUND_0 (D, E, A, B, C, W[7]); - P_SHA1_ROUND_0 (C, D, E, A, B, W[8]); - P_SHA1_ROUND_0 (B, C, D, E, A, W[9]); - P_SHA1_ROUND_0 (A, B, C, D, E, W[10]); - P_SHA1_ROUND_0 (E, A, B, C, D, W[11]); - P_SHA1_ROUND_0 (D, E, A, B, C, W[12]); - P_SHA1_ROUND_0 (C, D, E, A, B, W[13]); - P_SHA1_ROUND_0 (B, C, D, E, A, W[14]); - P_SHA1_ROUND_0 (A, B, C, D, E, W[15]); - P_SHA1_ROUND_0 (E, A, B, C, D, P_SHA1_W (W, 16)); - P_SHA1_ROUND_0 (D, E, A, B, C, P_SHA1_W (W, 17)); - P_SHA1_ROUND_0 (C, D, E, A, B, P_SHA1_W (W, 18)); - P_SHA1_ROUND_0 (B, C, D, E, A, P_SHA1_W (W, 19)); - - P_SHA1_ROUND_1 (A, B, C, D, E, P_SHA1_W (W, 20)); - P_SHA1_ROUND_1 (E, A, B, C, D, P_SHA1_W (W, 21)); - P_SHA1_ROUND_1 (D, E, A, B, C, P_SHA1_W (W, 22)); - P_SHA1_ROUND_1 (C, D, E, A, B, P_SHA1_W (W, 23)); - P_SHA1_ROUND_1 (B, C, D, E, A, P_SHA1_W (W, 24)); - P_SHA1_ROUND_1 (A, B, C, D, E, P_SHA1_W (W, 25)); - P_SHA1_ROUND_1 (E, A, B, C, D, P_SHA1_W (W, 26)); - P_SHA1_ROUND_1 (D, E, A, B, C, P_SHA1_W (W, 27)); - P_SHA1_ROUND_1 (C, D, E, A, B, P_SHA1_W (W, 28)); - P_SHA1_ROUND_1 (B, C, D, E, A, P_SHA1_W (W, 29)); - P_SHA1_ROUND_1 (A, B, C, D, E, P_SHA1_W (W, 30)); - P_SHA1_ROUND_1 (E, A, B, C, D, P_SHA1_W (W, 31)); - P_SHA1_ROUND_1 (D, E, A, B, C, P_SHA1_W (W, 32)); - P_SHA1_ROUND_1 (C, D, E, A, B, P_SHA1_W (W, 33)); - P_SHA1_ROUND_1 (B, C, D, E, A, P_SHA1_W (W, 34)); - P_SHA1_ROUND_1 (A, B, C, D, E, P_SHA1_W (W, 35)); - P_SHA1_ROUND_1 (E, A, B, C, D, P_SHA1_W (W, 36)); - P_SHA1_ROUND_1 (D, E, A, B, C, P_SHA1_W (W, 37)); - P_SHA1_ROUND_1 (C, D, E, A, B, P_SHA1_W (W, 38)); - P_SHA1_ROUND_1 (B, C, D, E, A, P_SHA1_W (W, 39)); - - P_SHA1_ROUND_2 (A, B, C, D, E, P_SHA1_W (W, 40)); - P_SHA1_ROUND_2 (E, A, B, C, D, P_SHA1_W (W, 41)); - P_SHA1_ROUND_2 (D, E, A, B, C, P_SHA1_W (W, 42)); - P_SHA1_ROUND_2 (C, D, E, A, B, P_SHA1_W (W, 43)); - P_SHA1_ROUND_2 (B, C, D, E, A, P_SHA1_W (W, 44)); - P_SHA1_ROUND_2 (A, B, C, D, E, P_SHA1_W (W, 45)); - P_SHA1_ROUND_2 (E, A, B, C, D, P_SHA1_W (W, 46)); - P_SHA1_ROUND_2 (D, E, A, B, C, P_SHA1_W (W, 47)); - P_SHA1_ROUND_2 (C, D, E, A, B, P_SHA1_W (W, 48)); - P_SHA1_ROUND_2 (B, C, D, E, A, P_SHA1_W (W, 49)); - P_SHA1_ROUND_2 (A, B, C, D, E, P_SHA1_W (W, 50)); - P_SHA1_ROUND_2 (E, A, B, C, D, P_SHA1_W (W, 51)); - P_SHA1_ROUND_2 (D, E, A, B, C, P_SHA1_W (W, 52)); - P_SHA1_ROUND_2 (C, D, E, A, B, P_SHA1_W (W, 53)); - P_SHA1_ROUND_2 (B, C, D, E, A, P_SHA1_W (W, 54)); - P_SHA1_ROUND_2 (A, B, C, D, E, P_SHA1_W (W, 55)); - P_SHA1_ROUND_2 (E, A, B, C, D, P_SHA1_W (W, 56)); - P_SHA1_ROUND_2 (D, E, A, B, C, P_SHA1_W (W, 57)); - P_SHA1_ROUND_2 (C, D, E, A, B, P_SHA1_W (W, 58)); - P_SHA1_ROUND_2 (B, C, D, E, A, P_SHA1_W (W, 59)); - - P_SHA1_ROUND_3 (A, B, C, D, E, P_SHA1_W (W, 60)); - P_SHA1_ROUND_3 (E, A, B, C, D, P_SHA1_W (W, 61)); - P_SHA1_ROUND_3 (D, E, A, B, C, P_SHA1_W (W, 62)); - P_SHA1_ROUND_3 (C, D, E, A, B, P_SHA1_W (W, 63)); - P_SHA1_ROUND_3 (B, C, D, E, A, P_SHA1_W (W, 64)); - P_SHA1_ROUND_3 (A, B, C, D, E, P_SHA1_W (W, 65)); - P_SHA1_ROUND_3 (E, A, B, C, D, P_SHA1_W (W, 66)); - P_SHA1_ROUND_3 (D, E, A, B, C, P_SHA1_W (W, 67)); - P_SHA1_ROUND_3 (C, D, E, A, B, P_SHA1_W (W, 68)); - P_SHA1_ROUND_3 (B, C, D, E, A, P_SHA1_W (W, 69)); - P_SHA1_ROUND_3 (A, B, C, D, E, P_SHA1_W (W, 70)); - P_SHA1_ROUND_3 (E, A, B, C, D, P_SHA1_W (W, 71)); - P_SHA1_ROUND_3 (D, E, A, B, C, P_SHA1_W (W, 72)); - P_SHA1_ROUND_3 (C, D, E, A, B, P_SHA1_W (W, 73)); - P_SHA1_ROUND_3 (B, C, D, E, A, P_SHA1_W (W, 74)); - P_SHA1_ROUND_3 (A, B, C, D, E, P_SHA1_W (W, 75)); - P_SHA1_ROUND_3 (E, A, B, C, D, P_SHA1_W (W, 76)); - P_SHA1_ROUND_3 (D, E, A, B, C, P_SHA1_W (W, 77)); - P_SHA1_ROUND_3 (C, D, E, A, B, P_SHA1_W (W, 78)); - P_SHA1_ROUND_3 (B, C, D, E, A, P_SHA1_W (W, 79)); + P_SHA1_ROUND_0 (A, B, C, D, E, W[0]) + P_SHA1_ROUND_0 (E, A, B, C, D, W[1]) + P_SHA1_ROUND_0 (D, E, A, B, C, W[2]) + P_SHA1_ROUND_0 (C, D, E, A, B, W[3]) + P_SHA1_ROUND_0 (B, C, D, E, A, W[4]) + P_SHA1_ROUND_0 (A, B, C, D, E, W[5]) + P_SHA1_ROUND_0 (E, A, B, C, D, W[6]) + P_SHA1_ROUND_0 (D, E, A, B, C, W[7]) + P_SHA1_ROUND_0 (C, D, E, A, B, W[8]) + P_SHA1_ROUND_0 (B, C, D, E, A, W[9]) + P_SHA1_ROUND_0 (A, B, C, D, E, W[10]) + P_SHA1_ROUND_0 (E, A, B, C, D, W[11]) + P_SHA1_ROUND_0 (D, E, A, B, C, W[12]) + P_SHA1_ROUND_0 (C, D, E, A, B, W[13]) + P_SHA1_ROUND_0 (B, C, D, E, A, W[14]) + P_SHA1_ROUND_0 (A, B, C, D, E, W[15]) + P_SHA1_ROUND_0 (E, A, B, C, D, P_SHA1_W (W, 16)) + P_SHA1_ROUND_0 (D, E, A, B, C, P_SHA1_W (W, 17)) + P_SHA1_ROUND_0 (C, D, E, A, B, P_SHA1_W (W, 18)) + P_SHA1_ROUND_0 (B, C, D, E, A, P_SHA1_W (W, 19)) + + P_SHA1_ROUND_1 (A, B, C, D, E, P_SHA1_W (W, 20)) + P_SHA1_ROUND_1 (E, A, B, C, D, P_SHA1_W (W, 21)) + P_SHA1_ROUND_1 (D, E, A, B, C, P_SHA1_W (W, 22)) + P_SHA1_ROUND_1 (C, D, E, A, B, P_SHA1_W (W, 23)) + P_SHA1_ROUND_1 (B, C, D, E, A, P_SHA1_W (W, 24)) + P_SHA1_ROUND_1 (A, B, C, D, E, P_SHA1_W (W, 25)) + P_SHA1_ROUND_1 (E, A, B, C, D, P_SHA1_W (W, 26)) + P_SHA1_ROUND_1 (D, E, A, B, C, P_SHA1_W (W, 27)) + P_SHA1_ROUND_1 (C, D, E, A, B, P_SHA1_W (W, 28)) + P_SHA1_ROUND_1 (B, C, D, E, A, P_SHA1_W (W, 29)) + P_SHA1_ROUND_1 (A, B, C, D, E, P_SHA1_W (W, 30)) + P_SHA1_ROUND_1 (E, A, B, C, D, P_SHA1_W (W, 31)) + P_SHA1_ROUND_1 (D, E, A, B, C, P_SHA1_W (W, 32)) + P_SHA1_ROUND_1 (C, D, E, A, B, P_SHA1_W (W, 33)) + P_SHA1_ROUND_1 (B, C, D, E, A, P_SHA1_W (W, 34)) + P_SHA1_ROUND_1 (A, B, C, D, E, P_SHA1_W (W, 35)) + P_SHA1_ROUND_1 (E, A, B, C, D, P_SHA1_W (W, 36)) + P_SHA1_ROUND_1 (D, E, A, B, C, P_SHA1_W (W, 37)) + P_SHA1_ROUND_1 (C, D, E, A, B, P_SHA1_W (W, 38)) + P_SHA1_ROUND_1 (B, C, D, E, A, P_SHA1_W (W, 39)) + + P_SHA1_ROUND_2 (A, B, C, D, E, P_SHA1_W (W, 40)) + P_SHA1_ROUND_2 (E, A, B, C, D, P_SHA1_W (W, 41)) + P_SHA1_ROUND_2 (D, E, A, B, C, P_SHA1_W (W, 42)) + P_SHA1_ROUND_2 (C, D, E, A, B, P_SHA1_W (W, 43)) + P_SHA1_ROUND_2 (B, C, D, E, A, P_SHA1_W (W, 44)) + P_SHA1_ROUND_2 (A, B, C, D, E, P_SHA1_W (W, 45)) + P_SHA1_ROUND_2 (E, A, B, C, D, P_SHA1_W (W, 46)) + P_SHA1_ROUND_2 (D, E, A, B, C, P_SHA1_W (W, 47)) + P_SHA1_ROUND_2 (C, D, E, A, B, P_SHA1_W (W, 48)) + P_SHA1_ROUND_2 (B, C, D, E, A, P_SHA1_W (W, 49)) + P_SHA1_ROUND_2 (A, B, C, D, E, P_SHA1_W (W, 50)) + P_SHA1_ROUND_2 (E, A, B, C, D, P_SHA1_W (W, 51)) + P_SHA1_ROUND_2 (D, E, A, B, C, P_SHA1_W (W, 52)) + P_SHA1_ROUND_2 (C, D, E, A, B, P_SHA1_W (W, 53)) + P_SHA1_ROUND_2 (B, C, D, E, A, P_SHA1_W (W, 54)) + P_SHA1_ROUND_2 (A, B, C, D, E, P_SHA1_W (W, 55)) + P_SHA1_ROUND_2 (E, A, B, C, D, P_SHA1_W (W, 56)) + P_SHA1_ROUND_2 (D, E, A, B, C, P_SHA1_W (W, 57)) + P_SHA1_ROUND_2 (C, D, E, A, B, P_SHA1_W (W, 58)) + P_SHA1_ROUND_2 (B, C, D, E, A, P_SHA1_W (W, 59)) + + P_SHA1_ROUND_3 (A, B, C, D, E, P_SHA1_W (W, 60)) + P_SHA1_ROUND_3 (E, A, B, C, D, P_SHA1_W (W, 61)) + P_SHA1_ROUND_3 (D, E, A, B, C, P_SHA1_W (W, 62)) + P_SHA1_ROUND_3 (C, D, E, A, B, P_SHA1_W (W, 63)) + P_SHA1_ROUND_3 (B, C, D, E, A, P_SHA1_W (W, 64)) + P_SHA1_ROUND_3 (A, B, C, D, E, P_SHA1_W (W, 65)) + P_SHA1_ROUND_3 (E, A, B, C, D, P_SHA1_W (W, 66)) + P_SHA1_ROUND_3 (D, E, A, B, C, P_SHA1_W (W, 67)) + P_SHA1_ROUND_3 (C, D, E, A, B, P_SHA1_W (W, 68)) + P_SHA1_ROUND_3 (B, C, D, E, A, P_SHA1_W (W, 69)) + P_SHA1_ROUND_3 (A, B, C, D, E, P_SHA1_W (W, 70)) + P_SHA1_ROUND_3 (E, A, B, C, D, P_SHA1_W (W, 71)) + P_SHA1_ROUND_3 (D, E, A, B, C, P_SHA1_W (W, 72)) + P_SHA1_ROUND_3 (C, D, E, A, B, P_SHA1_W (W, 73)) + P_SHA1_ROUND_3 (B, C, D, E, A, P_SHA1_W (W, 74)) + P_SHA1_ROUND_3 (A, B, C, D, E, P_SHA1_W (W, 75)) + P_SHA1_ROUND_3 (E, A, B, C, D, P_SHA1_W (W, 76)) + P_SHA1_ROUND_3 (D, E, A, B, C, P_SHA1_W (W, 77)) + P_SHA1_ROUND_3 (C, D, E, A, B, P_SHA1_W (W, 78)) + P_SHA1_ROUND_3 (B, C, D, E, A, P_SHA1_W (W, 79)) ctx->hash[0] += A; ctx->hash[1] += B; diff --git a/src/pcryptohash-sha2-256.c b/src/pcryptohash-sha2-256.c index ea8db4f..4afbeeb 100644 --- a/src/pcryptohash-sha2-256.c +++ b/src/pcryptohash-sha2-256.c @@ -128,25 +128,25 @@ pp_crypto_hash_sha2_256_process (PHashSHA2_256 *ctx, memcpy (W, data, 64); for (i = 0; i < 16; i += 8) { - P_SHA2_256_P (A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], W[i + 0], pp_crypto_hash_sha2_256_K[i + 0]); - P_SHA2_256_P (A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], W[i + 1], pp_crypto_hash_sha2_256_K[i + 1]); - P_SHA2_256_P (A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], W[i + 2], pp_crypto_hash_sha2_256_K[i + 2]); - P_SHA2_256_P (A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], W[i + 3], pp_crypto_hash_sha2_256_K[i + 3]); - P_SHA2_256_P (A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], W[i + 4], pp_crypto_hash_sha2_256_K[i + 4]); - P_SHA2_256_P (A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], W[i + 5], pp_crypto_hash_sha2_256_K[i + 5]); - P_SHA2_256_P (A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], W[i + 6], pp_crypto_hash_sha2_256_K[i + 6]); - P_SHA2_256_P (A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], W[i + 7], pp_crypto_hash_sha2_256_K[i + 7]); + P_SHA2_256_P (A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], W[i + 0], pp_crypto_hash_sha2_256_K[i + 0]) + P_SHA2_256_P (A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], W[i + 1], pp_crypto_hash_sha2_256_K[i + 1]) + P_SHA2_256_P (A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], W[i + 2], pp_crypto_hash_sha2_256_K[i + 2]) + P_SHA2_256_P (A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], W[i + 3], pp_crypto_hash_sha2_256_K[i + 3]) + P_SHA2_256_P (A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], W[i + 4], pp_crypto_hash_sha2_256_K[i + 4]) + P_SHA2_256_P (A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], W[i + 5], pp_crypto_hash_sha2_256_K[i + 5]) + P_SHA2_256_P (A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], W[i + 6], pp_crypto_hash_sha2_256_K[i + 6]) + P_SHA2_256_P (A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], W[i + 7], pp_crypto_hash_sha2_256_K[i + 7]) } for (i = 16; i < 64; i += 8) { - P_SHA2_256_P (A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], P_SHA2_256_R (i + 0), pp_crypto_hash_sha2_256_K[i + 0]); - P_SHA2_256_P (A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], P_SHA2_256_R (i + 1), pp_crypto_hash_sha2_256_K[i + 1]); - P_SHA2_256_P (A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], P_SHA2_256_R (i + 2), pp_crypto_hash_sha2_256_K[i + 2]); - P_SHA2_256_P (A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], P_SHA2_256_R (i + 3), pp_crypto_hash_sha2_256_K[i + 3]); - P_SHA2_256_P (A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], P_SHA2_256_R (i + 4), pp_crypto_hash_sha2_256_K[i + 4]); - P_SHA2_256_P (A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], P_SHA2_256_R (i + 5), pp_crypto_hash_sha2_256_K[i + 5]); - P_SHA2_256_P (A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], P_SHA2_256_R (i + 6), pp_crypto_hash_sha2_256_K[i + 6]); - P_SHA2_256_P (A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], P_SHA2_256_R (i + 7), pp_crypto_hash_sha2_256_K[i + 7]); + P_SHA2_256_P (A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], P_SHA2_256_R (i + 0), pp_crypto_hash_sha2_256_K[i + 0]) + P_SHA2_256_P (A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], P_SHA2_256_R (i + 1), pp_crypto_hash_sha2_256_K[i + 1]) + P_SHA2_256_P (A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], P_SHA2_256_R (i + 2), pp_crypto_hash_sha2_256_K[i + 2]) + P_SHA2_256_P (A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], P_SHA2_256_R (i + 3), pp_crypto_hash_sha2_256_K[i + 3]) + P_SHA2_256_P (A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], P_SHA2_256_R (i + 4), pp_crypto_hash_sha2_256_K[i + 4]) + P_SHA2_256_P (A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], P_SHA2_256_R (i + 5), pp_crypto_hash_sha2_256_K[i + 5]) + P_SHA2_256_P (A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], P_SHA2_256_R (i + 6), pp_crypto_hash_sha2_256_K[i + 6]) + P_SHA2_256_P (A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], P_SHA2_256_R (i + 7), pp_crypto_hash_sha2_256_K[i + 7]) } for (i = 0; i < 8; i++) diff --git a/src/pcryptohash-sha2-512.c b/src/pcryptohash-sha2-512.c index 98693d2..ff2df6f 100644 --- a/src/pcryptohash-sha2-512.c +++ b/src/pcryptohash-sha2-512.c @@ -153,14 +153,14 @@ pp_crypto_hash_sha2_512_process (PHashSHA2_512 *ctx, W[i] = P_SHA2_512_S1 (W[i - 2]) + W[i - 7] + P_SHA2_512_S0 (W[i - 15]) + W[i - 16]; for (i = 0; i < 80; i += 8) { - P_SHA2_512_P (A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], W[i + 0], pp_crypto_hash_sha2_512_K[i + 0]); - P_SHA2_512_P (A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], W[i + 1], pp_crypto_hash_sha2_512_K[i + 1]); - P_SHA2_512_P (A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], W[i + 2], pp_crypto_hash_sha2_512_K[i + 2]); - P_SHA2_512_P (A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], W[i + 3], pp_crypto_hash_sha2_512_K[i + 3]); - P_SHA2_512_P (A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], W[i + 4], pp_crypto_hash_sha2_512_K[i + 4]); - P_SHA2_512_P (A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], W[i + 5], pp_crypto_hash_sha2_512_K[i + 5]); - P_SHA2_512_P (A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], W[i + 6], pp_crypto_hash_sha2_512_K[i + 6]); - P_SHA2_512_P (A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], W[i + 7], pp_crypto_hash_sha2_512_K[i + 7]); + P_SHA2_512_P (A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], W[i + 0], pp_crypto_hash_sha2_512_K[i + 0]) + P_SHA2_512_P (A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], W[i + 1], pp_crypto_hash_sha2_512_K[i + 1]) + P_SHA2_512_P (A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], W[i + 2], pp_crypto_hash_sha2_512_K[i + 2]) + P_SHA2_512_P (A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], W[i + 3], pp_crypto_hash_sha2_512_K[i + 3]) + P_SHA2_512_P (A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], W[i + 4], pp_crypto_hash_sha2_512_K[i + 4]) + P_SHA2_512_P (A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], W[i + 5], pp_crypto_hash_sha2_512_K[i + 5]) + P_SHA2_512_P (A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], W[i + 6], pp_crypto_hash_sha2_512_K[i + 6]) + P_SHA2_512_P (A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], W[i + 7], pp_crypto_hash_sha2_512_K[i + 7]) } for (i = 0; i < 8; ++i) diff --git a/src/pcryptohash.c b/src/pcryptohash.c index 9bf00cc..7e93c0c 100644 --- a/src/pcryptohash.c +++ b/src/pcryptohash.c @@ -87,47 +87,47 @@ p_crypto_hash_new (PCryptoHashType type) switch (type) { case P_CRYPTO_HASH_TYPE_MD5: - P_HASH_FUNCS (ret, md5); + P_HASH_FUNCS (ret, md5) ret->hash_len = 16; break; case P_CRYPTO_HASH_TYPE_SHA1: - P_HASH_FUNCS (ret, sha1); + P_HASH_FUNCS (ret, sha1) ret->hash_len = 20; break; case P_CRYPTO_HASH_TYPE_SHA2_224: - P_HASH_FUNCS (ret, sha2_224); + P_HASH_FUNCS (ret, sha2_224) ret->hash_len = 28; break; case P_CRYPTO_HASH_TYPE_SHA2_256: - P_HASH_FUNCS (ret, sha2_256); + P_HASH_FUNCS (ret, sha2_256) ret->hash_len = 32; break; case P_CRYPTO_HASH_TYPE_SHA2_384: - P_HASH_FUNCS (ret, sha2_384); + P_HASH_FUNCS (ret, sha2_384) ret->hash_len = 48; break; case P_CRYPTO_HASH_TYPE_SHA2_512: - P_HASH_FUNCS (ret, sha2_512); + P_HASH_FUNCS (ret, sha2_512) ret->hash_len = 64; break; case P_CRYPTO_HASH_TYPE_SHA3_224: - P_HASH_FUNCS (ret, sha3_224); + P_HASH_FUNCS (ret, sha3_224) ret->hash_len = 28; break; case P_CRYPTO_HASH_TYPE_SHA3_256: - P_HASH_FUNCS (ret, sha3_256); + P_HASH_FUNCS (ret, sha3_256) ret->hash_len = 32; break; case P_CRYPTO_HASH_TYPE_SHA3_384: - P_HASH_FUNCS (ret, sha3_384); + P_HASH_FUNCS (ret, sha3_384) ret->hash_len = 48; break; case P_CRYPTO_HASH_TYPE_SHA3_512: - P_HASH_FUNCS (ret, sha3_512); + P_HASH_FUNCS (ret, sha3_512) ret->hash_len = 64; break; case P_CRYPTO_HASH_TYPE_GOST: - P_HASH_FUNCS (ret, gost3411); + P_HASH_FUNCS (ret, gost3411) ret->hash_len = 32; break; }