From b6cc9a4084caf6d9d4b955fadc321f6521f2b36e Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Fri, 23 Jan 2015 17:09:54 +0000
Subject: Amalgamation fixes

---
 src/lib/pubkey/curve25519/donna.cpp | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'src/lib/pubkey/curve25519')

diff --git a/src/lib/pubkey/curve25519/donna.cpp b/src/lib/pubkey/curve25519/donna.cpp
index 29d40ce13..8a29e0db9 100644
--- a/src/lib/pubkey/curve25519/donna.cpp
+++ b/src/lib/pubkey/curve25519/donna.cpp
@@ -29,13 +29,10 @@
 
 #include <botan/curve25519.h>
 #include <botan/mul128.h>
+#include <botan/internal/donna128.h>
 #include <botan/loadstor.h>
 #include <string.h>
 
-#if !defined(BOTAN_TARGET_HAS_NATIVE_UINT128)
-  #include <botan/internal/donna128.h>
-#endif
-
 namespace Botan {
 
 typedef byte u8;
@@ -44,20 +41,6 @@ typedef limb felem[5];
 
 #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);
-   }
-
-inline u64bit combine_lower(const uint128_t a, size_t s1,
-                            const uint128_t b, size_t s2)
-   {
-   return static_cast<u64bit>((a >> s1) | (b << s2));
-   }
-
 #endif
 
 /* Sum two numbers: output += in */
-- 
cgit v1.2.3