propagate from branch 'net.randombit.botan' (head 95eb8083f5884531e5ca0667388f8a6fb6d05c41)

            to branch 'net.randombit.botan.c++0x' (head 56e105e678540c8bcafa4d0198c19a9489fbf8d1)

6 files changed, 36 insertions, 31 deletions

diff --git a/src/math/bigint/info.txt b/src/math/bigint/info.txt
index 908304c9f..513703deb 100644
--- a/src/math/bigint/info.txt
+++ b/src/math/bigint/info.txt
@@ -4,14 +4,6 @@ load_on auto
 
 define BIGINT
 
-<requires>
-hex
-rng
-mp_amd64|mp_asm64|mp_ia32|mp_ia32_msvc|mp_generic
-monty_generic
-mulop_generic
-</requires>
-
 <add>
 bigint.h
 divide.h
@@ -30,3 +22,12 @@ mp_karat.cpp
 mp_misc.cpp
 mp_shift.cpp
 </add>
+
+<requires>
+alloc
+hex
+mp_amd64|mp_asm64|mp_ia32|mp_ia32_msvc|mp_generic
+monty_generic
+mulop_generic
+rng
+</requires>
diff --git a/src/math/bigint/monty_amd64/info.txt b/src/math/bigint/monty_amd64/info.txt
index 32308bf41..7fb70da46 100644
--- a/src/math/bigint/monty_amd64/info.txt
+++ b/src/math/bigint/monty_amd64/info.txt
@@ -2,16 +2,12 @@ realname "Montgomery Reduction (x86-64)"
 
 mp_bits 64
 
-load_on request
+load_on never
 
 <add>
 mp_monty.S
 </add>
 
-<requires>
-asm_amd64
-</requires>
-
 <arch>
 amd64
 </arch>
@@ -29,3 +25,7 @@ netbsd
 openbsd
 solaris
 </os>
+
+<requires>
+asm_amd64
+</requires>
diff --git a/src/math/bigint/mulop_amd64/info.txt b/src/math/bigint/mulop_amd64/info.txt
index 0960ac4d6..c4b14db93 100644
--- a/src/math/bigint/mulop_amd64/info.txt
+++ b/src/math/bigint/mulop_amd64/info.txt
@@ -2,16 +2,12 @@ realname "BigInt Multiply-Add (x86-64)"
 
 mp_bits 64
 
-load_on request
+load_on never
 
 <add>
 mp_mulop_amd64.S
 </add>
 
-<requires>
-asm_amd64
-</requires>
-
 <arch>
 amd64
 </arch>
@@ -29,3 +25,7 @@ netbsd
 openbsd
 solaris
 </os>
+
+<requires>
+asm_amd64
+</requires>
diff --git a/src/math/bigint/mulop_ia32/info.txt b/src/math/bigint/mulop_ia32/info.txt
index 1c89e95c1..a7b525bfb 100644
--- a/src/math/bigint/mulop_ia32/info.txt
+++ b/src/math/bigint/mulop_ia32/info.txt
@@ -10,10 +10,6 @@ load_on request
 mp_mulop.S
 </add>
 
-<requires>
-asm_ia32
-</requires>
-
 <arch>
 ia32
 </arch>
@@ -31,3 +27,7 @@ netbsd
 openbsd
 solaris
 </os>
+
+<requires>
+asm_ia32
+</requires>
diff --git a/src/math/gfpmath/info.txt b/src/math/gfpmath/info.txt
index e90569d26..1a52144b7 100644
--- a/src/math/gfpmath/info.txt
+++ b/src/math/gfpmath/info.txt
@@ -6,11 +6,6 @@ load_on auto
 
 define BIGINT_GFP
 
-<requires>
-bigint
-numbertheory
-</requires>
-
 <add>
 curve_gfp.cpp
 curve_gfp.h
@@ -20,3 +15,8 @@ gfp_modulus.h
 point_gfp.cpp
 point_gfp.h
 </add>
+
+<requires>
+bigint
+numbertheory
+</requires>
diff --git a/src/math/numbertheory/info.txt b/src/math/numbertheory/info.txt
index 6ce3583c8..1595c7305 100644
--- a/src/math/numbertheory/info.txt
+++ b/src/math/numbertheory/info.txt
@@ -4,10 +4,6 @@ load_on auto
 
 define BIGINT_MATH
 
-<requires>
-bigint
-</requires>
-
 <add>
 blinding.cpp
 blinding.h
@@ -27,3 +23,11 @@ reducer.cpp
 reducer.h
 ressol.cpp
 </add>
+
+<requires>
+algo_factory
+bigint
+hash
+libstate
+rng
+</requires>