aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/mac
diff options
context:
space:
mode:
authorlloyd <[email protected]>2015-01-23 17:09:54 +0000
committerlloyd <[email protected]>2015-01-23 17:09:54 +0000
commitb6cc9a4084caf6d9d4b955fadc321f6521f2b36e (patch)
tree89eb2fcb93014c016ed61b0967f3af649e5b8c86 /src/lib/mac
parent9a0da0565c042c0f0a09caed036621c47e3f494e (diff)
Amalgamation fixes
Diffstat (limited to 'src/lib/mac')
-rw-r--r--src/lib/mac/poly1305/poly1305_donna.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/mac/poly1305/poly1305_donna.h b/src/lib/mac/poly1305/poly1305_donna.h
index fa190baa5..128d0359b 100644
--- a/src/lib/mac/poly1305/poly1305_donna.h
+++ b/src/lib/mac/poly1305/poly1305_donna.h
@@ -12,10 +12,7 @@
#include <botan/loadstor.h>
#include <botan/mul128.h>
-
-#if !defined(BOTAN_TARGET_HAS_NATIVE_UINT128)
- #include <botan/internal/donna128.h>
-#endif
+#include <botan/internal/donna128.h>
namespace Botan {
@@ -23,11 +20,6 @@ namespace {
#if !defined(BOTAN_TARGET_HAS_NATIVE_UINT128)
typedef donna128 uint128_t;
-#else
-inline u64bit carry_shift(const uint128_t a, size_t shift)
- {
- return static_cast<u64bit>(a >> shift);
- }
#endif
void poly1305_init(secure_vector<u64bit>& X, const byte key[32])