Add a script that reads the output of print_deps.py and rewrites

the info.txt files with the right module dependencies.

Apply it across the codebase.

4 files changed, 17 insertions, 5 deletions

diff --git a/src/s2k/info.txt b/src/s2k/info.txt
index 44510bbd7..e603fd937 100644
--- a/src/s2k/info.txt
+++ b/src/s2k/info.txt
@@ -2,12 +2,12 @@ realname "String to Key Functions"
 
 load_on auto
 
-<requires>
-utils
-rng
-</requires>
-
 <add>
 s2k.cpp
 s2k.h
 </add>
+
+<requires>
+rng
+sym_algo
+</requires>
diff --git a/src/s2k/pbkdf1/info.txt b/src/s2k/pbkdf1/info.txt
index 3c1ae802c..4c5b27546 100644
--- a/src/s2k/pbkdf1/info.txt
+++ b/src/s2k/pbkdf1/info.txt
@@ -8,3 +8,7 @@ load_on auto
 pbkdf1.cpp
 pbkdf1.h
 </add>
+
+<requires>
+hash
+</requires>
diff --git a/src/s2k/pbkdf2/info.txt b/src/s2k/pbkdf2/info.txt
index e51a331c6..921aeb1ab 100644
--- a/src/s2k/pbkdf2/info.txt
+++ b/src/s2k/pbkdf2/info.txt
@@ -8,3 +8,7 @@ load_on auto
 pbkdf2.cpp
 pbkdf2.h
 </add>
+
+<requires>
+mac
+</requires>
diff --git a/src/s2k/pgps2k/info.txt b/src/s2k/pgps2k/info.txt
index a3d5a146f..14b75a02b 100644
--- a/src/s2k/pgps2k/info.txt
+++ b/src/s2k/pgps2k/info.txt
@@ -8,3 +8,7 @@ load_on auto
 pgp_s2k.cpp
 pgp_s2k.h
 </add>
+
+<requires>
+hash
+</requires>