diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2012-11-12 20:55:19 +0100 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2012-11-12 20:55:19 +0100 |
| commit | d20990fd971a18fab36df5d578647b1d9559574b (patch) | |
| tree | 26710f3a06ca54eefac34476fda14687ff94913a /serpent-encrypt.c | |
| parent | 83b7c95b68d60b79b63e3a840c7a6b6aaa17097a (diff) | |
| download | nettle-d20990fd971a18fab36df5d578647b1d9559574b.tar.gz | |
Renamed serpent-internal.h macros.
Diffstat (limited to 'serpent-encrypt.c')
| -rw-r--r-- | serpent-encrypt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/serpent-encrypt.c b/serpent-encrypt.c index e82efea0..2c77f12d 100644 --- a/serpent-encrypt.c +++ b/serpent-encrypt.c @@ -411,16 +411,16 @@ #define LINEAR_TRANSFORMATION64(x0,x1,x2,x3) \ do { \ - x0 = ROTL64 (13, x0); \ - x2 = ROTL64 (3, x2); \ + x0 = DROTL32 (13, x0); \ + x2 = DROTL32 (3, x2); \ x1 = x1 ^ x0 ^ x2; \ - x3 = x3 ^ x2 ^ RSHIFT64(3, x0); \ - x1 = ROTL64 (1, x1); \ - x3 = ROTL64 (7, x3); \ + x3 = x3 ^ x2 ^ DRSHIFT32(3, x0); \ + x1 = DROTL32 (1, x1); \ + x3 = DROTL32 (7, x3); \ x0 = x0 ^ x1 ^ x3; \ - x2 = x2 ^ x3 ^ RSHIFT64(7, x1); \ - x0 = ROTL64 (5, x0); \ - x2 = ROTL64 (22, x2); \ + x2 = x2 ^ x3 ^ DRSHIFT32(7, x1); \ + x0 = DROTL32 (5, x0); \ + x2 = DROTL32 (22, x2); \ } while (0) #define ROUND64(which, subkey, x0,x1,x2,x3, y0,y1,y2,y3) \ |