From 9511fdbdb6bf2da911976972f37e44329adc9bbe Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Tue, 13 Oct 2015 09:45:07 -0500 Subject: [PATCH] md5: bitwise operations - add () to silence warns and improve style --- external/3rd/library/platform/utils/Base/MD5.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/external/3rd/library/platform/utils/Base/MD5.cpp b/external/3rd/library/platform/utils/Base/MD5.cpp index a988f46b..7fa9f806 100644 --- a/external/3rd/library/platform/utils/Base/MD5.cpp +++ b/external/3rd/library/platform/utils/Base/MD5.cpp @@ -59,7 +59,7 @@ namespace Base int k = l = 0; for(; l < i; l += 4) { - ai[k] = achar0[l + j] & 0xff | (achar0[l + 1 + j] & 0xff) << 8 | (achar0[l + 2 + j] & 0xff) << 16 | (achar0[l + 3 + j] & 0xff) << 24; + ai[k] = (achar0[l + j] & 0xff) | (achar0[l + 1 + j] & 0xff) << 8 | (achar0[l + 2 + j] & 0xff) << 16 | (achar0[l + 3 + j] & 0xff) << 24; k++; } @@ -84,7 +84,7 @@ namespace Base int MD5::FF(int i, int j, int k, int l, int i1, int j1, int k1) { - i = uadd(i, j & k | ~j & l, i1, k1); + i = uadd(i, (j & k) | (~j & l), i1, k1); return uadd(rotate_left(i, j1), j); } @@ -106,7 +106,7 @@ namespace Base int MD5::GG(int i, int j, int k, int l, int i1, int j1, int k1) { - i = uadd(i, j & l | k & ~l, i1, k1); + i = uadd(i, (j & l) | (k & ~l), i1, k1); return uadd(rotate_left(i, j1), j); } @@ -128,7 +128,7 @@ namespace Base { padding.resize(64,0); padding[0] = -128; - } + } finalsNull = true; }