diff options
| author | lloyd <[email protected]> | 2009-12-16 02:52:12 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-16 02:52:12 +0000 |
| commit | 317b76d71dca1840c9e72f9a26407590719c1423 (patch) | |
| tree | 2eb49072e6e27f6ee41e704004aa8689b1e98bb3 /src/block/serpent_simd/serp_simd.cpp | |
| parent | 457ce43934a4e51ead4d21e43013eef9d448d0e1 (diff) | |
| parent | 12afeca214c4414a0ced0bc4654d0fc5908dc77b (diff) | |
propagate from branch 'net.randombit.botan' (head 744dccf92270cf16b80b50ee2759424c9866b256)
to branch 'net.randombit.botan.c++0x' (head 2aa1acac1d05e8ea9991fe39015b1db9abc3b24e)
Diffstat (limited to 'src/block/serpent_simd/serp_simd.cpp')
| -rw-r--r-- | src/block/serpent_simd/serp_simd.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/block/serpent_simd/serp_simd.cpp b/src/block/serpent_simd/serp_simd.cpp index b394b0c26..3a42db55f 100644 --- a/src/block/serpent_simd/serp_simd.cpp +++ b/src/block/serpent_simd/serp_simd.cpp @@ -6,9 +6,9 @@ */ #include <botan/serp_simd.h> -#include <botan/serp_simd_sbox.h> -#include <botan/simd_32.h> -#include <botan/loadstor.h> +#include <botan/internal/serp_simd_sbox.h> +#include <botan/internal/simd_32.h> +#include <botan/internal/loadstor.h> namespace Botan { @@ -171,6 +171,10 @@ void serpent_decrypt_4(const byte in[64], } +#undef key_xor +#undef transform +#undef i_transform + /* * Serpent Encryption */ |