u64 we_t = w[14];
u64 wf_t = w[15];
- #define ROUND_EXPAND() \
+ #define ROUND_EXPAND_S() \
{ \
w0_t = SHA512_EXPAND_S (we_t, w9_t, w1_t, w0_t); \
w1_t = SHA512_EXPAND_S (wf_t, wa_t, w2_t, w1_t); \
wf_t = SHA512_EXPAND_S (wd_t, w8_t, w0_t, wf_t); \
}
- #define ROUND_STEP(i) \
+ #define ROUND_STEP_S(i) \
{ \
SHA512_STEP_S (SHA512_F0o, SHA512_F1o, a, b, c, d, e, f, g, h, w0_t, k_sha512[i + 0]); \
SHA512_STEP_S (SHA512_F0o, SHA512_F1o, h, a, b, c, d, e, f, g, w1_t, k_sha512[i + 1]); \
SHA512_STEP_S (SHA512_F0o, SHA512_F1o, b, c, d, e, f, g, h, a, wf_t, k_sha512[i + 15]); \
}
- ROUND_STEP (0);
+ ROUND_STEP_S (0);
#ifdef _unroll
#pragma unroll
#endif
for (int i = 16; i < 80; i += 16)
{
- ROUND_EXPAND (); ROUND_STEP (i);
+ ROUND_EXPAND_S (); ROUND_STEP_S (i);
}
dgst[0] += a;
u32 we_t = w3[2];
u32 wf_t = w3[3];
- #define ROUND_EXPAND() \
+ #define ROUND_EXPAND_S() \
{ \
w0_t = SHA256_EXPAND_S (we_t, w9_t, w1_t, w0_t); \
w1_t = SHA256_EXPAND_S (wf_t, wa_t, w2_t, w1_t); \
wf_t = SHA256_EXPAND_S (wd_t, w8_t, w0_t, wf_t); \
}
- #define ROUND_STEP(i) \
- { \
+ #define ROUND_STEP_S(i) \
+ { \
SHA256_STEP_S (SHA256_F0o, SHA256_F1o, a, b, c, d, e, f, g, h, w0_t, k_sha256[i + 0]); \
SHA256_STEP_S (SHA256_F0o, SHA256_F1o, h, a, b, c, d, e, f, g, w1_t, k_sha256[i + 1]); \
SHA256_STEP_S (SHA256_F0o, SHA256_F1o, g, h, a, b, c, d, e, f, w2_t, k_sha256[i + 2]); \
SHA256_STEP_S (SHA256_F0o, SHA256_F1o, b, c, d, e, f, g, h, a, wf_t, k_sha256[i + 15]); \
}
- ROUND_STEP (0);
+ ROUND_STEP_S (0);
#ifdef _unroll
#pragma unroll
#endif
for (int i = 16; i < 64; i += 16)
{
- ROUND_EXPAND (); ROUND_STEP (i);
+ ROUND_EXPAND_S (); ROUND_STEP_S (i);
}
digest[0] += a;