cleanup: Big pile of whitespace fixes, all at once.

[u/mdw/catacomb] / serpent.c

diff --git a/serpent.c b/serpent.c
index 75ceec8..9c03764 100644 (file)
--- a/serpent.c
+++ b/serpent.c
@@ -7,7 +7,7 @@
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -135,15 +135,15 @@ void serpent_init(serpent_ctx *k, const void *buf, size_t sz)
   a ^= *k++; b ^= *k++; c ^= *k++; d ^= *k++;                          \
   S##r(a, b, c, d);                                                    \
   a = ROL32(a, 13); c = ROL32(c,  3); b ^= a ^ c; d ^= c ^ (a << 3);   \
-  b = ROL32(b,  1); d = ROL32(d,  7); a ^= b ^ d; c ^= d ^ (b << 7);   \
-  a = ROL32(a,  5); c = ROL32(c, 22);                                  \
+  b = ROL32(b, 1); d = ROL32(d,  7); a ^= b ^ d; c ^= d ^ (b << 7);    \
+  a = ROL32(a, 5); c = ROL32(c, 22);                                   \
 } while (0)
 
 #define DROUND(a, b, c, d, r, k) do {                                  \
   IS##r(a, b, c, d);                                                   \
   d ^= *--k; c ^= *--k; b ^= *--k; a ^= *--k;                          \
-  a = ROR32(a,  5); c = ROR32(c, 22); a ^= b ^ d; c ^= d ^ (b << 7);   \
-  b = ROR32(b,  1); d = ROR32(d,  7); b ^= a ^ c; d ^= c ^ (a << 3);   \
+  a = ROR32(a, 5); c = ROR32(c, 22); a ^= b ^ d; c ^= d ^ (b << 7);    \
+  b = ROR32(b, 1); d = ROR32(d,  7); b ^= a ^ c; d ^= c ^ (a << 3);    \
   a = ROR32(a, 13); c = ROR32(c,  3);                                  \
 } while (0)