From 0b166f3ca96bb98c1a750c7bffe8ac62736975c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niels=20M=C3=B6ller?= Date: Mon, 20 Jun 2011 14:25:16 +0200 Subject: [PATCH] Trivial whitespace fixes in sbox macros. Rev: nettle/serpent-decrypt.c:1.3 --- serpent-decrypt.c | 90 +++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/serpent-decrypt.c b/serpent-decrypt.c index 88539b0b..1a6fbb47 100644 --- a/serpent-decrypt.c +++ b/serpent-decrypt.c @@ -74,21 +74,21 @@ do { \ type t02, t03, t04, t05, t06, t08, t09, t10; \ type t12, t13, t14, t15, t17, t18, t01; \ - t01 = x2 ^ x3 ; \ - t02 = x0 | x1 ; \ - t03 = x1 | x2 ; \ + t01 = x2 ^ x3; \ + t02 = x0 | x1; \ + t03 = x1 | x2; \ t04 = x2 & t01; \ t05 = t02 ^ t01; \ t06 = x0 | t04; \ y2 = ~ t05; \ - t08 = x1 ^ x3 ; \ + t08 = x1 ^ x3; \ t09 = t03 & t08; \ - t10 = x3 | y2 ; \ + t10 = x3 | y2; \ y1 = t09 ^ t06; \ t12 = x0 | t05; \ t13 = y1 ^ t12; \ t14 = t03 ^ t10; \ - t15 = x0 ^ x2 ; \ + t15 = x0 ^ x2; \ y3 = t14 ^ t13; \ t17 = t05 & t13; \ t18 = t14 | t17; \ @@ -99,9 +99,9 @@ do { \ type t02, t03, t04, t05, t06, t07, t08; \ type t09, t10, t11, t14, t15, t17, t01; \ - t01 = x0 ^ x1 ; \ - t02 = x1 | x3 ; \ - t03 = x0 & x2 ; \ + t01 = x0 ^ x1; \ + t02 = x1 | x3; \ + t03 = x0 & x2; \ t04 = x2 ^ t02; \ t05 = x0 | t04; \ t06 = t01 & t05; \ @@ -112,8 +112,8 @@ t11 = x3 & t08; \ y2 = ~ t09; \ y1 = t10 ^ t11; \ - t14 = x0 | y2 ; \ - t15 = t06 ^ y1 ; \ + t14 = x0 | y2; \ + t15 = t06 ^ y1; \ y3 = t01 ^ t04; \ t17 = x2 ^ t15; \ y0 = t14 ^ t17; \ @@ -123,22 +123,22 @@ do { \ type t02, t03, t04, t06, t07, t08, t09; \ type t10, t11, t12, t15, t16, t17, t01; \ - t01 = x0 ^ x3 ; \ - t02 = x2 ^ x3 ; \ - t03 = x0 & x2 ; \ + t01 = x0 ^ x3; \ + t02 = x2 ^ x3; \ + t03 = x0 & x2; \ t04 = x1 | t02; \ y0 = t01 ^ t04; \ - t06 = x0 | x2 ; \ - t07 = x3 | y0 ; \ - t08 = ~ x3 ; \ + t06 = x0 | x2; \ + t07 = x3 | y0; \ + t08 = ~ x3; \ t09 = x1 & t06; \ t10 = t08 | t03; \ t11 = x1 & t07; \ t12 = t06 & t02; \ y3 = t09 ^ t10; \ y1 = t12 ^ t11; \ - t15 = x2 & y3 ; \ - t16 = y0 ^ y1 ; \ + t15 = x2 & y3; \ + t16 = y0 ^ y1; \ t17 = t10 ^ t15; \ y2 = t16 ^ t17; \ } while (0) @@ -147,11 +147,11 @@ do { \ type t02, t03, t04, t05, t06, t07, t09; \ type t11, t12, t13, t14, t16, t01; \ - t01 = x2 | x3 ; \ - t02 = x0 | x3 ; \ + t01 = x2 | x3; \ + t02 = x0 | x3; \ t03 = x2 ^ t02; \ t04 = x1 ^ t02; \ - t05 = x0 ^ x3 ; \ + t05 = x0 ^ x3; \ t06 = t04 & t03; \ t07 = x1 & t01; \ y2 = t05 ^ t06; \ @@ -159,7 +159,7 @@ y0 = t07 ^ t03; \ t11 = y0 | t05; \ t12 = t09 & t11; \ - t13 = x0 & y2 ; \ + t13 = x0 & y2; \ t14 = t01 ^ t05; \ y1 = x1 ^ t12; \ t16 = x1 | t13; \ @@ -170,11 +170,11 @@ do { \ type t02, t03, t04, t05, t06, t07, t09; \ type t10, t11, t12, t13, t15, t01; \ - t01 = x1 | x3 ; \ - t02 = x2 | x3 ; \ + t01 = x1 | x3; \ + t02 = x2 | x3; \ t03 = x0 & t01; \ t04 = x1 ^ t02; \ - t05 = x2 ^ x3 ; \ + t05 = x2 ^ x3; \ t06 = ~ t03; \ t07 = x0 & t04; \ y1 = t05 ^ t07; \ @@ -193,22 +193,22 @@ do { \ type t02, t03, t04, t05, t07, t08, t09; \ type t10, t12, t13, t15, t16, t01; \ - t01 = x0 & x3 ; \ + t01 = x0 & x3; \ t02 = x2 ^ t01; \ - t03 = x0 ^ x3 ; \ + t03 = x0 ^ x3; \ t04 = x1 & t02; \ - t05 = x0 & x2 ; \ + t05 = x0 & x2; \ y0 = t03 ^ t04; \ - t07 = x0 & y0 ; \ - t08 = t01 ^ y0 ; \ + t07 = x0 & y0; \ + t08 = t01 ^ y0; \ t09 = x1 | t05; \ - t10 = ~ x1 ; \ + t10 = ~ x1; \ y1 = t08 ^ t09; \ t12 = t10 | t07; \ - t13 = y0 | y1 ; \ + t13 = y0 | y1; \ y3 = t02 ^ t12; \ t15 = t02 ^ t13; \ - t16 = x1 ^ x3 ; \ + t16 = x1 ^ x3; \ y2 = t16 ^ t15; \ } while (0) @@ -216,23 +216,23 @@ do { \ type t02, t03, t04, t05, t06, t07, t08, t09; \ type t12, t13, t14, t15, t16, t17, t01; \ - t01 = x0 ^ x2 ; \ - t02 = ~ x2 ; \ + t01 = x0 ^ x2; \ + t02 = ~ x2; \ t03 = x1 & t01; \ t04 = x1 | t02; \ t05 = x3 | t03; \ - t06 = x1 ^ x3 ; \ + t06 = x1 ^ x3; \ t07 = x0 & t04; \ t08 = x0 | t02; \ t09 = t07 ^ t05; \ y1 = t06 ^ t08; \ y0 = ~ t09; \ - t12 = x1 & y0 ; \ + t12 = x1 & y0; \ t13 = t01 & t05; \ t14 = t01 ^ t12; \ t15 = t07 ^ t13; \ t16 = x3 | t02; \ - t17 = x0 ^ y1 ; \ + t17 = x0 ^ y1; \ y3 = t17 ^ t15; \ y2 = t16 ^ t14; \ } while (0) @@ -241,21 +241,21 @@ do { \ type t02, t03, t04, t06, t07, t08, t09; \ type t10, t11, t13, t14, t15, t16, t01; \ - t01 = x0 & x1 ; \ - t02 = x0 | x1 ; \ + t01 = x0 & x1; \ + t02 = x0 | x1; \ t03 = x2 | t01; \ t04 = x3 & t02; \ y3 = t03 ^ t04; \ t06 = x1 ^ t04; \ - t07 = x3 ^ y3 ; \ + t07 = x3 ^ y3; \ t08 = ~ t07; \ t09 = t06 | t08; \ - t10 = x1 ^ x3 ; \ - t11 = x0 | x3 ; \ + t10 = x1 ^ x3; \ + t11 = x0 | x3; \ y1 = x0 ^ t09; \ t13 = x2 ^ t06; \ t14 = x2 & t11; \ - t15 = x3 | y1 ; \ + t15 = x3 | y1; \ t16 = t01 | t10; \ y0 = t13 ^ t15; \ y2 = t14 ^ t16; \ -- 2.47.3