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

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

8 files changed, 38 insertions, 37 deletions

diff --git a/src/hash/gost_3411/info.txt b/src/hash/gost_3411/info.txt
index ef2879823..65b9475e1 100644
--- a/src/hash/gost_3411/info.txt
+++ b/src/hash/gost_3411/info.txt
@@ -8,3 +8,7 @@ load_on auto
 gost_3411.cpp
 gost_3411.h
 </add>
+
+<requires>
+gost_28147
+</requires>
diff --git a/src/hash/info.txt b/src/hash/info.txt
index fb1f734d7..ce55f7ddc 100644
--- a/src/hash/info.txt
+++ b/src/hash/info.txt
@@ -2,10 +2,10 @@ realname "Hash Functions"
 
 load_on auto
 
-<requires>
-utils
-</requires>
-
 <add>
 hash.h
 </add>
+
+<requires>
+buf_comp
+</requires>
diff --git a/src/hash/md4_ia32/info.txt b/src/hash/md4_ia32/info.txt
index e7249ad5f..e5287dc5d 100644
--- a/src/hash/md4_ia32/info.txt
+++ b/src/hash/md4_ia32/info.txt
@@ -10,12 +10,6 @@ md4_ia32.cpp
 md4_ia32.h
 </add>
 
-<requires>
-ia32_eng
-asm_ia32
-md4
-</requires>
-
 <arch>
 ia32
 </arch>
@@ -33,3 +27,8 @@ netbsd
 openbsd
 solaris
 </os>
+
+<requires>
+asm_ia32
+md4
+</requires>
diff --git a/src/hash/md5_ia32/info.txt b/src/hash/md5_ia32/info.txt
index 7133e1ddd..f69ab82e6 100644
--- a/src/hash/md5_ia32/info.txt
+++ b/src/hash/md5_ia32/info.txt
@@ -10,13 +10,6 @@ md5_ia32.cpp
 md5_ia32.h
 </add>
 
-<requires>
-ia32_eng
-asm_ia32
-mdx_hash
-utils
-</requires>
-
 <arch>
 ia32
 </arch>
@@ -34,3 +27,8 @@ netbsd
 openbsd
 solaris
 </os>
+
+<requires>
+asm_ia32
+md5
+</requires>
diff --git a/src/hash/sha1_amd64/info.txt b/src/hash/sha1_amd64/info.txt
index 662d60c69..ddbc7d380 100644
--- a/src/hash/sha1_amd64/info.txt
+++ b/src/hash/sha1_amd64/info.txt
@@ -10,13 +10,6 @@ sha1_amd64.cpp
 sha1_amd64.h
 </add>
 
-<requires>
-amd64_eng
-asm_amd64
-sha1
-utils
-</requires>
-
 <arch>
 amd64
 </arch>
@@ -33,3 +26,9 @@ netbsd
 openbsd
 solaris
 </os>
+
+<requires>
+amd64_eng
+asm_amd64
+sha1
+</requires>
diff --git a/src/hash/sha1_ia32/info.txt b/src/hash/sha1_ia32/info.txt
index 8c333dc57..ca14028b8 100644
--- a/src/hash/sha1_ia32/info.txt
+++ b/src/hash/sha1_ia32/info.txt
@@ -10,13 +10,6 @@ sha1_ia32.cpp
 sha1_ia32.h
 </add>
 
-<requires>
-ia32_eng
-asm_ia32
-sha1
-utils
-</requires>
-
 <arch>
 ia32
 </arch>
@@ -34,3 +27,8 @@ netbsd
 openbsd
 solaris
 </os>
+
+<requires>
+asm_ia32
+sha1
+</requires>
diff --git a/src/hash/sha1_sse2/info.txt b/src/hash/sha1_sse2/info.txt
index e33bb1859..b8d693b70 100644
--- a/src/hash/sha1_sse2/info.txt
+++ b/src/hash/sha1_sse2/info.txt
@@ -10,12 +10,6 @@ sha1_sse2.cpp
 sha1_sse2.h
 </add>
 
-<requires>
-sse2_eng
-sha1
-utils
-</requires>
-
 <arch>
 pentium-m
 pentium4
@@ -27,3 +21,8 @@ amd64
 gcc
 icc
 </cc>
+
+<requires>
+sha1
+sse2_eng
+</requires>
diff --git a/src/hash/skein/info.txt b/src/hash/skein/info.txt
index d2d482d81..bab8497c5 100644
--- a/src/hash/skein/info.txt
+++ b/src/hash/skein/info.txt
@@ -8,3 +8,7 @@ load_on auto
 skein_512.cpp
 skein_512.h
 </add>
+
+<requires>
+alloc
+</requires>