diff options
| author | lloyd <[email protected]> | 2009-11-05 17:17:09 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-11-05 17:17:09 +0000 |
| commit | 1860807e4ed230f3aeea0831ec180e55d2f0eaa4 (patch) | |
| tree | 26de4fd5ab0d94ef7700ea1c077b8e11ec523fbb /src/block/serpent_simd/serp_simd_sbox.h | |
| parent | b8658279904708d0690e473fb85942d5da23d2fc (diff) | |
| parent | 56c3c044215f36fe00c9a8a2e06a84f969996cb7 (diff) | |
propagate from branch 'net.randombit.botan' (head cead7027e70b68a8b4ae2e5bd8f290066e5ea22a)
to branch 'net.randombit.botan.c++0x' (head 9edbd485060131b695170f5243a100e06e3b0c71)
Diffstat (limited to 'src/block/serpent_simd/serp_simd_sbox.h')
| -rw-r--r-- | src/block/serpent_simd/serp_simd_sbox.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/block/serpent_simd/serp_simd_sbox.h b/src/block/serpent_simd/serp_simd_sbox.h index 6e3da7359..fe70f0063 100644 --- a/src/block/serpent_simd/serp_simd_sbox.h +++ b/src/block/serpent_simd/serp_simd_sbox.h @@ -76,11 +76,10 @@ B4 ^= B0; \ B1 ^= B3; \ B1 ^= B4; \ - B4 = ~B4; \ B0 = B2; \ B2 = B1; \ B1 = B3; \ - B3 = B4; \ + B3 = ~B4; \ } while(0); #define SBoxE4(B0, B1, B2, B3) \ @@ -165,7 +164,7 @@ #define SBoxE7(B0, B1, B2, B3) \ do { \ - B2 = ~B2; \ + B2 = ~B2; \ SIMD_32 B4 = B3; \ B3 &= B0; \ B0 ^= B4; \ |