diff options
Diffstat (limited to 'contrib/pgcrypto/crypt-blowfish.c')
| -rw-r--r-- | contrib/pgcrypto/crypt-blowfish.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/contrib/pgcrypto/crypt-blowfish.c b/contrib/pgcrypto/crypt-blowfish.c index 6feaefcf7be..dcaacfb9c26 100644 --- a/contrib/pgcrypto/crypt-blowfish.c +++ b/contrib/pgcrypto/crypt-blowfish.c @@ -469,7 +469,7 @@ BF_swap(BF_word *x, int count) tmp3 ^= tmp2; \ (R) ^= data.ctx.P[(N) + 1]; \ tmp3 += tmp1; \ - (R) ^= tmp3; + (R) ^= tmp3 #else /* Architectures with no complicated addressing modes supported */ #define BF_INDEX(S, i) \ @@ -490,7 +490,7 @@ BF_swap(BF_word *x, int count) tmp3 ^= tmp2; \ (R) ^= data.ctx.P[(N) + 1]; \ tmp3 += tmp1; \ - (R) ^= tmp3; + (R) ^= tmp3 #endif /* @@ -516,17 +516,18 @@ BF_swap(BF_word *x, int count) BF_ROUND(R, L, 15); \ tmp4 = R; \ R = L; \ - L = tmp4 ^ data.ctx.P[BF_N + 1]; + L = tmp4 ^ data.ctx.P[BF_N + 1] #if BF_ASM extern void _BF_body_r(BF_ctx *ctx); #define BF_body() \ - _BF_body_r(&data.ctx); + _BF_body_r(&data.ctx) #else #define BF_body() \ +do { \ L = R = 0; \ ptr = data.ctx.P; \ do { \ @@ -542,7 +543,8 @@ extern void _BF_body_r(BF_ctx *ctx); BF_ENCRYPT; \ *(ptr - 2) = L; \ *(ptr - 1) = R; \ - } while (ptr < &data.ctx.S[3][0xFF]); + } while (ptr < &data.ctx.S[3][0xFF]); \ +} while (0) #endif static void |