wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

wolfcrypt/src/siphash.c: fixes for bugprone-macro-parentheses.

Browse Source
This commit is contained in:
Daniel Pouzzner
2024-09-11 13:48:14 -05:00
parent 1b0ef048ba
commit 5b8e9e692f
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
wolfcrypt/src/siphash.c
View File

@@ -805,29 +805,29 @@ int wc_SipHash(const unsigned char* key, const unsigned char* in, word32 inSz,
#else #else
#define SipRoundV(v0, v1, v2, v3) \ #define SipRoundV(v0, v1, v2, v3) \
v0 += v1; \ (v0) += (v1); \
v2 += v3; \ (v2) += (v3); \
v1 = rotlFixed64(v1, 13); \ (v1) = rotlFixed64(v1, 13); \
v3 = rotlFixed64(v3, 16); \ (v3) = rotlFixed64(v3, 16); \
v1 ^= v0; \ (v1) ^= (v0); \
v3 ^= v2; \ (v3) ^= (v2); \
v0 = rotlFixed64(v0, 32); \ (v0) = rotlFixed64(v0, 32); \
v2 += v1; \ (v2) += (v1); \
v0 += v3; \ (v0) += (v3); \
v1 = rotlFixed64(v1, 17); \ (v1) = rotlFixed64(v1, 17); \
v3 = rotlFixed64(v3, 21); \ (v3) = rotlFixed64(v3, 21); \
v1 ^= v2; \ (v1) ^= (v2); \
v3 ^= v0; \ (v3) ^= (v0); \
v2 = rotlFixed64(v2, 32); (v2) = rotlFixed64(v2, 32);
#define SipHashCompressV(v0, v1, v2, v3, m) \ #define SipHashCompressV(v0, v1, v2, v3, m) \
do { \ do { \
int i; \ int i; \
v3 ^= m; \ (v3) ^= (m); \
for (i = 0; i < WOLFSSL_SIPHASH_CROUNDS; i++) { \ for (i = 0; i < WOLFSSL_SIPHASH_CROUNDS; i++) { \
SipRoundV(v0, v1, v2, v3); \ SipRoundV(v0, v1, v2, v3); \
} \ } \
v0 ^= m; \ (v0) ^= (m); \
} \ } \
while (0) while (0)
@@ -839,7 +839,7 @@ int wc_SipHash(const unsigned char* key, const unsigned char* in, word32 inSz,
for (i = 0; i < WOLFSSL_SIPHASH_DROUNDS; i++) { \ for (i = 0; i < WOLFSSL_SIPHASH_DROUNDS; i++) { \
SipRoundV(v0, v1, v2, v3); \ SipRoundV(v0, v1, v2, v3); \
} \ } \
n = v0 ^ v1 ^ v2 ^ v3; \ n = (v0) ^ (v1) ^ (v2) ^ (v3); \
SET_U64(out, n); \ SET_U64(out, n); \
} \ } \
while (0) while (0)