X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/fe6657c961b01ec72e9f35f4c3d96b11b31cf09c..45c0fd363937c6e9b05da04a9167e9912c05ca0c:/serpent-sbox.h diff --git a/serpent-sbox.h b/serpent-sbox.h index 27b6f93..1612330 100644 --- a/serpent-sbox.h +++ b/serpent-sbox.h @@ -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, @@ -50,7 +50,7 @@ #define S0(r0, r1, r2, r3) do { \ uint32 r4; \ - r3 ^= r0; r4 = r1; r1 &= r3; r4 ^= r2; \ + r3 ^= r0; r4 = r1; r1 &= r3; r4 ^= r2; \ r1 ^= r0; r0 |= r3; r0 ^= r4; r4 ^= r3; \ r3 ^= r2; r2 |= r1; r2 ^= r4; r4 = ~r4; \ r4 |= r1; r1 ^= r3; r1 ^= r4; r3 |= r0; \ @@ -60,7 +60,7 @@ #define IS0(r0, r1, r2, r3) do { \ uint32 r4; \ - r2 = ~r2; r4 = r1; r1 |= r0; r4 = ~r4; \ + r2 = ~r2; r4 = r1; r1 |= r0; r4 = ~r4; \ r1 ^= r2; r2 |= r4; r1 ^= r3; r0 ^= r4; \ r2 ^= r0; r0 &= r3; r4 ^= r0; r0 |= r1; \ r0 ^= r2; r3 ^= r4; r2 ^= r1; r3 ^= r0; \ @@ -169,7 +169,7 @@ #define IS5(r0, r1, r2, r3) do { \ uint32 r4; \ - r1 = ~r1; r4 = r3; r2 ^= r1; r3 |= r0; \ + r1 = ~r1; r4 = r3; r2 ^= r1; r3 |= r0; \ r3 ^= r2; r2 |= r1; r2 &= r0; r4 ^= r3; \ r2 ^= r4; r4 |= r0; r4 ^= r1; r1 &= r2; \ r1 ^= r3; r4 ^= r2; r3 &= r4; r4 ^= r1; \ @@ -181,7 +181,7 @@ #define S6(r0, r1, r2, r3) do { \ uint32 r4; \ - r2 = ~r2; r4 = r3; r3 &= r0; r0 ^= r4; \ + r2 = ~r2; r4 = r3; r3 &= r0; r0 ^= r4; \ r3 ^= r2; r2 |= r4; r1 ^= r3; r2 ^= r0; \ r0 |= r1; r2 ^= r1; r4 ^= r0; r0 |= r3; \ r0 ^= r2; r4 ^= r3; r4 ^= r0; r3 = ~r3; \ @@ -191,7 +191,7 @@ #define IS6(r0, r1, r2, r3) do { \ uint32 r4; \ - r0 ^= r2; r4 = r2; r2 &= r0; r4 ^= r3; \ + r0 ^= r2; r4 = r2; r2 &= r0; r4 ^= r3; \ r2 = ~r2; r3 ^= r1; r2 ^= r3; r4 |= r0; \ r0 ^= r2; r3 ^= r4; r4 ^= r1; r1 &= r3; \ r1 ^= r0; r0 ^= r3; r0 |= r2; r3 ^= r1; \