Move botan.h from utils to libstate, since libstate has lookup.h which

botan.h includes unconditionally.

Remove obsolete seed_rng code from init.h

4 files changed, 5 insertions, 13 deletions

diff --git a/src/utils/botan.h b/src/libstate/botan.h
index 1149fe063..1149fe063 100644
--- a/src/utils/botan.h
+++ b/src/libstate/botan.h
diff --git a/src/libstate/info.txt b/src/libstate/info.txt
index c5d20ad1f..c1a0b8667 100644
--- a/src/libstate/info.txt
+++ b/src/libstate/info.txt
@@ -11,10 +11,7 @@ s2k
 </requires>
 
 <add>
-lookup_cipher.cpp
-lookup_hash.cpp
-lookup_mac.cpp
-lookup_s2k.cpp
+botan.h
 def_mode.cpp
 def_powm.cpp
 eng_base.cpp
@@ -30,6 +27,10 @@ libstate.h
 look_add.h
 lookup.cpp
 lookup.h
+lookup_cipher.cpp
+lookup_hash.cpp
+lookup_mac.cpp
+lookup_s2k.cpp
 modules.cpp
 modules.h
 policy.cpp
diff --git a/src/libstate/init.h b/src/libstate/init.h
index 86ef09bac..7963a6fd8 100644
--- a/src/libstate/init.h
+++ b/src/libstate/init.h
@@ -33,13 +33,6 @@ class BOTAN_DLL InitializerOptions
       bool use_engines() const;
 
       /**
-      * Check whether this set of options has enabled the seeding of the
-      * global RNG at startup.
-      * @return true if the seeding at startup is enabled
-      */
-      bool seed_rng() const;
-
-      /**
       * Check whether this set of options has enabled the memory
       * locking feature. This is implemented for Unix and Win32, but
       * it only reliably works for Unix. There, all SecureVectors and
@@ -78,7 +71,6 @@ class BOTAN_DLL InitializerOptions
       * "config=<file name>",
       * "selftest",
       * "fips140",
-      * "seed_rng",
       * "use_engines",
       * "secure_memory",
       * "thread_safe"
diff --git a/src/utils/info.txt b/src/utils/info.txt
index 5fad7127b..4999a08e7 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -14,7 +14,6 @@ filters
 
 <add>
 bit_ops.h
-botan.h
 bswap.h
 buf_comp.h
 charset.cpp