Change Builtin_Module constructor to take an InitializerOptions

instead of just a boolean, so it can (if desired) examine any arguments
it likes.

Only run the startup self tests if the selftest or fips140 option is
toggled on.

1 files changed, 2 insertions, 1 deletions

diff --git a/include/modules.h b/include/modules.h
index d2d83985c..f81fcb64a 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -6,6 +6,7 @@
 #ifndef BOTAN_MODULE_FACTORIES_H__
 #define BOTAN_MODULE_FACTORIES_H__
 
+#include <botan/init.h>
 #include <string>
 #include <vector>
 
@@ -46,7 +47,7 @@ class Builtin_Modules : public Modules
       std::vector<class EntropySource*> entropy_sources() const;
       std::vector<class Engine*> engines() const;
 
-      Builtin_Modules(bool sl) : should_lock(sl) {}
+      Builtin_Modules(const InitializerOptions&);
    private:
       const bool should_lock;
    };