@@ -259,14 +259,16 @@ gen_tabs(void)
259259#define star_x (x ) (((x) & 0x7f7f7f7f) << 1) ^ ((((x) & 0x80808080) >> 7) * 0x1b)
260260
261261#define imix_col (y ,x )\
262+ do { \
262263u= star_x(x);\
263264v= star_x(u);\
264265w= star_x(v);\
265266t= w ^ (x);\
266267 (y)= u ^ v ^ w;\
267268 (y) ^= rotr(u ^ t, 8) ^ \
268269 rotr(v ^ t, 16) ^ \
269- rotr(t,24)
270+ rotr(t,24);\
271+ } while (0)
270272
271273/* initialise the key schedule from the user supplied key*/
272274
@@ -367,17 +369,21 @@ rijndael_set_key(rijndael_ctx * ctx, const u4byte * in_key, const u4byte key_len
367369/* encrypt a block of text*/
368370
369371#define f_nround (bo ,bi ,k ) \
372+ do { \
370373f_rn(bo, bi, 0, k);\
371374f_rn(bo, bi, 1, k);\
372375f_rn(bo, bi, 2, k);\
373376f_rn(bo, bi, 3, k);\
374- k += 4
377+ k += 4;\
378+ } while (0)
375379
376380#define f_lround (bo ,bi ,k ) \
381+ do { \
377382f_rl(bo, bi, 0, k);\
378383f_rl(bo, bi, 1, k);\
379384f_rl(bo, bi, 2, k);\
380- f_rl(bo, bi, 3, k)
385+ f_rl(bo, bi, 3, k);\
386+ } while (0)
381387
382388void
383389rijndael_encrypt (rijndael_ctx * ctx ,const u4byte * in_blk ,u4byte * out_blk )
@@ -427,17 +433,21 @@ rijndael_encrypt(rijndael_ctx * ctx, const u4byte * in_blk, u4byte * out_blk)
427433/* decrypt a block of text*/
428434
429435#define i_nround (bo ,bi ,k ) \
436+ do { \
430437i_rn(bo, bi, 0, k);\
431438i_rn(bo, bi, 1, k);\
432439i_rn(bo, bi, 2, k);\
433440i_rn(bo, bi, 3, k);\
434- k -= 4
441+ k -= 4;\
442+ } while (0)
435443
436444#define i_lround (bo ,bi ,k ) \
445+ do { \
437446i_rl(bo, bi, 0, k);\
438447i_rl(bo, bi, 1, k);\
439448i_rl(bo, bi, 2, k);\
440- i_rl(bo, bi, 3, k)
449+ i_rl(bo, bi, 3, k);\
450+ } while (0)
441451
442452void
443453rijndael_decrypt (rijndael_ctx * ctx ,const u4byte * in_blk ,u4byte * out_blk )