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

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

4 files changed, 18 insertions, 11 deletions

diff --git a/src/block/info.txt b/src/block/info.txt
index 5df789736..ff48fb04a 100644
--- a/src/block/info.txt
+++ b/src/block/info.txt
@@ -4,11 +4,10 @@ load_on auto
 
 define BLOCK_CIPHER
 
-<requires>
-utils
-sym_algo
-</requires>
-
 <add>
 block_cipher.h
 </add>
+
+<requires>
+sym_algo
+</requires>
diff --git a/src/block/lion/info.txt b/src/block/lion/info.txt
index 558d71d0c..81ef58511 100644
--- a/src/block/lion/info.txt
+++ b/src/block/lion/info.txt
@@ -8,3 +8,8 @@ load_on auto
 lion.cpp
 lion.h
 </add>
+
+<requires>
+hash
+stream
+</requires>
diff --git a/src/block/lubyrack/info.txt b/src/block/lubyrack/info.txt
index d83df2409..a478526f4 100644
--- a/src/block/lubyrack/info.txt
+++ b/src/block/lubyrack/info.txt
@@ -8,3 +8,7 @@ load_on auto
 lubyrack.cpp
 lubyrack.h
 </add>
+
+<requires>
+hash
+</requires>
diff --git a/src/block/serpent_ia32/info.txt b/src/block/serpent_ia32/info.txt
index 8aca9b2ba..13b171fe9 100644
--- a/src/block/serpent_ia32/info.txt
+++ b/src/block/serpent_ia32/info.txt
@@ -10,12 +10,6 @@ serp_ia32.cpp
 serp_ia32.h
 </add>
 
-<requires>
-ia32_eng
-asm_ia32
-utils
-</requires>
-
 <arch>
 ia32
 </arch>
@@ -33,3 +27,8 @@ netbsd
 openbsd
 solaris
 </os>
+
+<requires>
+asm_ia32
+serpent
+</requires>