summaryrefslogtreecommitdiff
path: root/ext4_utils/sha1.c
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2016-05-18 15:00:49 -0700
committerChih-Hung Hsieh <chh@google.com>2016-05-18 15:00:49 -0700
commit91d5f60957f2f621fa09402faf651d687d287a9b (patch)
tree324aff9b579b1a669a074aa1e0185e0a97a79856 /ext4_utils/sha1.c
parent5767273e98eb1a17827f0eb95612fb3fb4d6f12c (diff)
downloadextras-91d5f60957f2f621fa09402faf651d687d287a9b.tar.gz
Fix misc-macro-parentheses warnings in ext4_utils.
Bug: 28705665 Change-Id: I00da37172c5c8ba37e09a9a5e6a47e9f7446efea
Diffstat (limited to 'ext4_utils/sha1.c')
-rw-r--r--ext4_utils/sha1.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/ext4_utils/sha1.c b/ext4_utils/sha1.c
index 463ec388..5a8a02fb 100644
--- a/ext4_utils/sha1.c
+++ b/ext4_utils/sha1.c
@@ -44,17 +44,17 @@
#else
# define blk0(i) block->l[i]
#endif
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
- ^block->l[(i+2)&15]^block->l[i&15],1))
+#define blk(i) (block->l[(i)&15] = rol(block->l[((i)+13)&15]^block->l[((i)+8)&15] \
+ ^block->l[((i)+2)&15]^block->l[(i)&15],1))
/*
* (R0+R1), R2, R3, R4 are the different operations (rounds) used in SHA1
*/
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+#define R0(v,w,x,y,z,i) z+=(((w)&((x)^(y)))^(y))+blk0(i)+0x5A827999+rol(v,5);(w)=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=(((w)&((x)^(y)))^(y))+blk(i)+0x5A827999+rol(v,5);(w)=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=((w)^(x)^(y))+blk(i)+0x6ED9EBA1+rol(v,5);(w)=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=((((w)|(x))&(y))|((w)&(x)))+blk(i)+0x8F1BBCDC+rol(v,5);(w)=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=((w)^(x)^(y))+blk(i)+0xCA62C1D6+rol(v,5);(w)=rol(w,30);
typedef union {
u_char c[64];