Skip to content

Commit 5b8e9e6

Browse files
committed
wolfcrypt/src/siphash.c: fixes for bugprone-macro-parentheses.
1 parent 1b0ef04 commit 5b8e9e6

1 file changed

Lines changed: 17 additions & 17 deletions

File tree

wolfcrypt/src/siphash.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -805,29 +805,29 @@ int wc_SipHash(const unsigned char* key, const unsigned char* in, word32 inSz,
805805
#else
806806

807807
#define SipRoundV(v0, v1, v2, v3) \
808-
v0 += v1; \
809-
v2 += v3; \
810-
v1 = rotlFixed64(v1, 13); \
811-
v3 = rotlFixed64(v3, 16); \
812-
v1 ^= v0; \
813-
v3 ^= v2; \
814-
v0 = rotlFixed64(v0, 32); \
815-
v2 += v1; \
816-
v0 += v3; \
817-
v1 = rotlFixed64(v1, 17); \
818-
v3 = rotlFixed64(v3, 21); \
819-
v1 ^= v2; \
820-
v3 ^= v0; \
821-
v2 = rotlFixed64(v2, 32);
808+
(v0) += (v1); \
809+
(v2) += (v3); \
810+
(v1) = rotlFixed64(v1, 13); \
811+
(v3) = rotlFixed64(v3, 16); \
812+
(v1) ^= (v0); \
813+
(v3) ^= (v2); \
814+
(v0) = rotlFixed64(v0, 32); \
815+
(v2) += (v1); \
816+
(v0) += (v3); \
817+
(v1) = rotlFixed64(v1, 17); \
818+
(v3) = rotlFixed64(v3, 21); \
819+
(v1) ^= (v2); \
820+
(v3) ^= (v0); \
821+
(v2) = rotlFixed64(v2, 32);
822822

823823
#define SipHashCompressV(v0, v1, v2, v3, m) \
824824
do { \
825825
int i; \
826-
v3 ^= m; \
826+
(v3) ^= (m); \
827827
for (i = 0; i < WOLFSSL_SIPHASH_CROUNDS; i++) { \
828828
SipRoundV(v0, v1, v2, v3); \
829829
} \
830-
v0 ^= m; \
830+
(v0) ^= (m); \
831831
} \
832832
while (0)
833833

@@ -839,7 +839,7 @@ int wc_SipHash(const unsigned char* key, const unsigned char* in, word32 inSz,
839839
for (i = 0; i < WOLFSSL_SIPHASH_DROUNDS; i++) { \
840840
SipRoundV(v0, v1, v2, v3); \
841841
} \
842-
n = v0 ^ v1 ^ v2 ^ v3; \
842+
n = (v0) ^ (v1) ^ (v2) ^ (v3); \
843843
SET_U64(out, n); \
844844
} \
845845
while (0)

0 commit comments

Comments
 (0)