aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/serpent_simd
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-12-16 00:32:49 +0000
committerlloyd <[email protected]>2009-12-16 00:32:49 +0000
commit87cbaef441c6baba2699a8ea53ac2562c46c772d (patch)
treea61455bcb4de0e0eab34953f7a53a84b512f34d3 /src/block/serpent_simd
parent076afc21c2b775d2658f33086b890255f6f2c70f (diff)
Full working amalgamation build, plus internal-only headers concept.
Diffstat (limited to 'src/block/serpent_simd')
-rw-r--r--src/block/serpent_simd/info.txt12
-rw-r--r--src/block/serpent_simd/serp_simd.cpp8
2 files changed, 18 insertions, 2 deletions
diff --git a/src/block/serpent_simd/info.txt b/src/block/serpent_simd/info.txt
index d65b41235..b3bf34972 100644
--- a/src/block/serpent_simd/info.txt
+++ b/src/block/serpent_simd/info.txt
@@ -5,3 +5,15 @@ serpent
simd_32
simd_engine
</requires>
+
+<source>
+serp_simd.cpp
+</source>
+
+<header:public>
+serp_simd.h
+</header:public>
+
+<header:internal>
+serp_simd_sbox.h
+</header:internal>
diff --git a/src/block/serpent_simd/serp_simd.cpp b/src/block/serpent_simd/serp_simd.cpp
index b394b0c26..0a535c9a0 100644
--- a/src/block/serpent_simd/serp_simd.cpp
+++ b/src/block/serpent_simd/serp_simd.cpp
@@ -6,8 +6,8 @@
*/
#include <botan/serp_simd.h>
-#include <botan/serp_simd_sbox.h>
-#include <botan/simd_32.h>
+#include <botan/internal/serp_simd_sbox.h>
+#include <botan/internal/simd_32.h>
#include <botan/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
*/