diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2011-06-13 21:13:57 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2011-06-13 21:13:57 +0200 |
| commit | 61c1cfc394bc2f787d6e34393e7059a26f3bdfd5 (patch) | |
| tree | a22b7c5ec393b09a88c3877f426f8c31f2c5cbad /serpent-encrypt.c | |
| parent | edb1b1a48789399b339d75b359440987002836a3 (diff) | |
| download | nettle-61c1cfc394bc2f787d6e34393e7059a26f3bdfd5.tar.gz | |
Minor sbox fixes.
Rev: nettle/serpent-encrypt.c:1.11
Diffstat (limited to 'serpent-encrypt.c')
| -rw-r--r-- | serpent-encrypt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/serpent-encrypt.c b/serpent-encrypt.c index fd3a68bb..a64a2ef6 100644 --- a/serpent-encrypt.c +++ b/serpent-encrypt.c @@ -101,7 +101,7 @@ y1 = x0 | x3; \ y2 = x2 ^ x3; \ y0 = ~ x1; \ - y3 = x0 ^ x2; \ + y3 = x0 ^ x2; \ y0 |= x0; \ y3 &= x3; \ x0 = y1 & y2; \ @@ -110,7 +110,7 @@ y3 ^= x0; \ x0 = y1 ^ y3; \ x0 ^= y2; \ - y1 = x1 & x3; \ + y1 = x1 & x3; \ y1 ^= x0; \ x3 = y3 | y1; \ y3 = ~ y3; \ @@ -164,14 +164,14 @@ */ #define SBOX3(x0, x1, x2, x3, y0, y1, y2, y3) \ do { \ - y2 = x0 ^ x2; \ + y1 = x0 ^ x2; \ y0 = x0 | x3; \ y3 = x0 & x3; \ - y1 = y2 & y0; \ + y1 &= y0; \ y3 |= x1; \ - y2 = x0 & x1; \ + y2 = x0 & x1; \ y2 |= x2; \ - x2 = x3 ^ y1; \ + x2 = x3 ^ y1; \ y1 ^= y3; \ x0 |= x2; \ x2 ^= x1; \ @@ -211,7 +211,7 @@ do { \ y3 = x0 | x1; \ y2 = x1 | x2; \ - y2 = x0 ^ y2; \ + y2 ^= x0; \ y3 &= x3; \ y0 = x1 ^ x3; \ x3 |= y2; \ |