14 files changed, 1 insertions, 39 deletions
diff --git a/src/math/bigint/bigint.cpp b/src/math/bigint/bigint.cpp
index 926bedc02..63bdc3605 100644
--- a/src/math/bigint/bigint.cpp
+++ b/src/math/bigint/bigint.cpp
@@ -9,7 +9,7 @@
 #include <botan/mp_core.h>
 #include <botan/loadstor.h>
 #include <botan/parsing.h>
-#include <botan/util.h>
+#include <botan/rounding.h>
 
 namespace Botan {
 
diff --git a/src/math/bigint/info.txt b/src/math/bigint/info.txt
index 513703deb..30018b795 100644
--- a/src/math/bigint/info.txt
+++ b/src/math/bigint/info.txt
@@ -1,5 +1,3 @@
-realname "BigInt"
-
 load_on auto
 
 define BIGINT
diff --git a/src/math/bigint/monty_amd64/info.txt b/src/math/bigint/monty_amd64/info.txt
index a897045b2..657cd0353 100644
--- a/src/math/bigint/monty_amd64/info.txt
+++ b/src/math/bigint/monty_amd64/info.txt
@@ -1,5 +1,3 @@
-realname "Montgomery Reduction (x86-64)"
-
 mp_bits 64
 
 load_on never
diff --git a/src/math/bigint/monty_generic/info.txt b/src/math/bigint/monty_generic/info.txt
index 6f5f0e722..c709229e6 100644
--- a/src/math/bigint/monty_generic/info.txt
+++ b/src/math/bigint/monty_generic/info.txt
@@ -1,5 +1,3 @@
-realname "Montgomery Reduction"
-
 load_on dep
 
 <add>
diff --git a/src/math/bigint/mp_amd64/info.txt b/src/math/bigint/mp_amd64/info.txt
index 84a5bcf53..a7da8806e 100644
--- a/src/math/bigint/mp_amd64/info.txt
+++ b/src/math/bigint/mp_amd64/info.txt
@@ -1,5 +1,3 @@
-realname "MPI Core (x86-64)"
-
 mp_bits 64
 
 load_on dep
diff --git a/src/math/bigint/mp_amd64/mp_asmi.h b/src/math/bigint/mp_amd64/mp_asmi.h
index 8bccbaaf4..1a3ac1aaa 100644
--- a/src/math/bigint/mp_amd64/mp_asmi.h
+++ b/src/math/bigint/mp_amd64/mp_asmi.h
@@ -70,20 +70,12 @@ extern "C" {
 */
 inline word word_add(word x, word y, word* carry)
    {
-#if 0
    asm(
       ADD_OR_SUBTRACT(ASM("adcq %[y],%[x]"))
       : [x]"=r"(x), [carry]"=r"(*carry)
       : "0"(x), [y]"rm"(y), "1"(*carry)
       : "cc");
    return x;
-#else
-   word z = x + y;
-   word c1 = (z < x);
-   z += *carry;
-   *carry = c1 | (z < *carry);
-   return z;
-#endif
    }
 
 /*
diff --git a/src/math/bigint/mp_asm64/info.txt b/src/math/bigint/mp_asm64/info.txt
index 5c112c490..7bdbffb2c 100644
--- a/src/math/bigint/mp_asm64/info.txt
+++ b/src/math/bigint/mp_asm64/info.txt
@@ -1,5 +1,3 @@
-realname "MPI Core (Alpha/IA-64/MIPS64/PowerPC-64/SPARC64)"
-
 mp_bits 64
 
 load_on dep
diff --git a/src/math/bigint/mp_generic/info.txt b/src/math/bigint/mp_generic/info.txt
index 8bf75fec3..28f258ebb 100644
--- a/src/math/bigint/mp_generic/info.txt
+++ b/src/math/bigint/mp_generic/info.txt
@@ -1,5 +1,3 @@
-realname "MPI Core (C++)"
-
 load_on dep
 
 <add>
diff --git a/src/math/bigint/mp_ia32/info.txt b/src/math/bigint/mp_ia32/info.txt
index 51f98fda8..6e093a7e5 100644
--- a/src/math/bigint/mp_ia32/info.txt
+++ b/src/math/bigint/mp_ia32/info.txt
@@ -1,5 +1,3 @@
-realname "MPI Core (IA-32)"
-
 mp_bits 32
 
 load_on asm_ok
diff --git a/src/math/bigint/mp_ia32/mp_asmi.h b/src/math/bigint/mp_ia32/mp_asmi.h
index 28b99abcc..46bf302d5 100644
--- a/src/math/bigint/mp_ia32/mp_asmi.h
+++ b/src/math/bigint/mp_ia32/mp_asmi.h
@@ -70,20 +70,12 @@ extern "C" {
 */
 inline word word_add(word x, word y, word* carry)
    {
-#if 0
    asm(
       ADD_OR_SUBTRACT(ASM("adcl %[y],%[x]"))
       : [x]"=r"(x), [carry]"=r"(*carry)
       : "0"(x), [y]"rm"(y), "1"(*carry)
       : "cc");
    return x;
-#else
-   word z = x + y;
-   word c1 = (z < x);
-   z += *carry;
-   *carry = c1 | (z < *carry);
-   return z;
-#endif
    }
 
 /*
diff --git a/src/math/bigint/mp_ia32_msvc/info.txt b/src/math/bigint/mp_ia32_msvc/info.txt
index 9c7ac9b43..52839d89b 100644
--- a/src/math/bigint/mp_ia32_msvc/info.txt
+++ b/src/math/bigint/mp_ia32_msvc/info.txt
@@ -1,5 +1,3 @@
-realname "x86 MPI Assembler Core (MSVC)"
-
 mp_bits 32
 
 load_on dep
diff --git a/src/math/bigint/mulop_amd64/info.txt b/src/math/bigint/mulop_amd64/info.txt
index 77990df80..704e4dad8 100644
--- a/src/math/bigint/mulop_amd64/info.txt
+++ b/src/math/bigint/mulop_amd64/info.txt
@@ -1,5 +1,3 @@
-realname "BigInt Multiply-Add (x86-64)"
-
 mp_bits 64
 
 load_on never
diff --git a/src/math/bigint/mulop_generic/info.txt b/src/math/bigint/mulop_generic/info.txt
index 28ebe41eb..8fa2a40c9 100644
--- a/src/math/bigint/mulop_generic/info.txt
+++ b/src/math/bigint/mulop_generic/info.txt
@@ -1,5 +1,3 @@
-realname "BigInt Multiply-Add"
-
 load_on dep
 
 <add>
diff --git a/src/math/bigint/mulop_ia32/info.txt b/src/math/bigint/mulop_ia32/info.txt
index b995dd8d7..dd554773f 100644
--- a/src/math/bigint/mulop_ia32/info.txt
+++ b/src/math/bigint/mulop_ia32/info.txt
@@ -1,5 +1,3 @@
-realname "BigInt Multiply-Add (IA-32)"
-
 mp_bits 32
 
 # Out of date, still implements bigint_mul_add_words