Move engine to libstate/ directory, since there is a mutual dependency

(messy).

Remove unused libstate.h includes from a few files.

39 files changed, 0 insertions, 3 deletions

diff --git a/src/cms/cms_algo.cpp b/src/cms/cms_algo.cpp
index cc675936a..b065676a8 100644
--- a/src/cms/cms_algo.cpp
+++ b/src/cms/cms_algo.cpp
@@ -7,7 +7,6 @@
 #include <botan/der_enc.h>
 #include <botan/lookup.h>
 #include <botan/filters.h>
-#include <botan/libstate.h>
 
 #if defined(BOTAN_HAS_RC2)
   #include <botan/rc2.h>
diff --git a/src/engine/def_engine/def_eng.h b/src/libstate/engine/def_engine/def_eng.h
index 3d3fba809..3d3fba809 100644
--- a/src/engine/def_engine/def_eng.h
+++ b/src/libstate/engine/def_engine/def_eng.h
diff --git a/src/engine/def_engine/def_mode.cpp b/src/libstate/engine/def_engine/def_mode.cpp
index 1148d6312..1148d6312 100644
--- a/src/engine/def_engine/def_mode.cpp
+++ b/src/libstate/engine/def_engine/def_mode.cpp
diff --git a/src/engine/def_engine/def_pk_ops.cpp b/src/libstate/engine/def_engine/def_pk_ops.cpp
index 5e29e110f..5e29e110f 100644
--- a/src/engine/def_engine/def_pk_ops.cpp
+++ b/src/libstate/engine/def_engine/def_pk_ops.cpp
diff --git a/src/engine/def_engine/def_powm.cpp b/src/libstate/engine/def_engine/def_powm.cpp
index 38aca901c..38aca901c 100644
--- a/src/engine/def_engine/def_powm.cpp
+++ b/src/libstate/engine/def_engine/def_powm.cpp
diff --git a/src/engine/def_engine/info.txt b/src/libstate/engine/def_engine/info.txt
index 0de7f37ab..0de7f37ab 100644
--- a/src/engine/def_engine/info.txt
+++ b/src/libstate/engine/def_engine/info.txt
diff --git a/src/engine/def_engine/lookup_cipher.cpp b/src/libstate/engine/def_engine/lookup_cipher.cpp
index 57dbbe60e..57dbbe60e 100644
--- a/src/engine/def_engine/lookup_cipher.cpp
+++ b/src/libstate/engine/def_engine/lookup_cipher.cpp
diff --git a/src/engine/def_engine/lookup_hash.cpp b/src/libstate/engine/def_engine/lookup_hash.cpp
index 10cc86785..10cc86785 100644
--- a/src/engine/def_engine/lookup_hash.cpp
+++ b/src/libstate/engine/def_engine/lookup_hash.cpp
diff --git a/src/engine/def_engine/lookup_mac.cpp b/src/libstate/engine/def_engine/lookup_mac.cpp
index db80d525f..db80d525f 100644
--- a/src/engine/def_engine/lookup_mac.cpp
+++ b/src/libstate/engine/def_engine/lookup_mac.cpp
diff --git a/src/engine/def_engine/lookup_s2k.cpp b/src/libstate/engine/def_engine/lookup_s2k.cpp
index 2f33ef6fc..2f33ef6fc 100644
--- a/src/engine/def_engine/lookup_s2k.cpp
+++ b/src/libstate/engine/def_engine/lookup_s2k.cpp
diff --git a/src/engine/engine.cpp b/src/libstate/engine/engine.cpp
index 59621a7d3..59621a7d3 100644
--- a/src/engine/engine.cpp
+++ b/src/libstate/engine/engine.cpp
diff --git a/src/engine/engine.h b/src/libstate/engine/engine.h
index 83870bb27..83870bb27 100644
--- a/src/engine/engine.h
+++ b/src/libstate/engine/engine.h
diff --git a/src/engine/gnump/eng_gmp.h b/src/libstate/engine/gnump/eng_gmp.h
index a0ff2661c..a0ff2661c 100644
--- a/src/engine/gnump/eng_gmp.h
+++ b/src/libstate/engine/gnump/eng_gmp.h
diff --git a/src/engine/gnump/gmp_dh.cpp b/src/libstate/engine/gnump/gmp_dh.cpp
index ef2732626..ef2732626 100644
--- a/src/engine/gnump/gmp_dh.cpp
+++ b/src/libstate/engine/gnump/gmp_dh.cpp
diff --git a/src/engine/gnump/gmp_dsa.cpp b/src/libstate/engine/gnump/gmp_dsa.cpp
index 209c6e0a6..209c6e0a6 100644
--- a/src/engine/gnump/gmp_dsa.cpp
+++ b/src/libstate/engine/gnump/gmp_dsa.cpp
diff --git a/src/engine/gnump/gmp_elg.cpp b/src/libstate/engine/gnump/gmp_elg.cpp
index 63e9440ff..63e9440ff 100644
--- a/src/engine/gnump/gmp_elg.cpp
+++ b/src/libstate/engine/gnump/gmp_elg.cpp
diff --git a/src/engine/gnump/gmp_if.cpp b/src/libstate/engine/gnump/gmp_if.cpp
index a4a4d0476..a4a4d0476 100644
--- a/src/engine/gnump/gmp_if.cpp
+++ b/src/libstate/engine/gnump/gmp_if.cpp
diff --git a/src/engine/gnump/gmp_mem.cpp b/src/libstate/engine/gnump/gmp_mem.cpp
index 91ba94dd7..91ba94dd7 100644
--- a/src/engine/gnump/gmp_mem.cpp
+++ b/src/libstate/engine/gnump/gmp_mem.cpp
diff --git a/src/engine/gnump/gmp_nr.cpp b/src/libstate/engine/gnump/gmp_nr.cpp
index 97b7e5554..97b7e5554 100644
--- a/src/engine/gnump/gmp_nr.cpp
+++ b/src/libstate/engine/gnump/gmp_nr.cpp
diff --git a/src/engine/gnump/gmp_powm.cpp b/src/libstate/engine/gnump/gmp_powm.cpp
index a5e3d1c0d..a5e3d1c0d 100644
--- a/src/engine/gnump/gmp_powm.cpp
+++ b/src/libstate/engine/gnump/gmp_powm.cpp
diff --git a/src/engine/gnump/gmp_wrap.cpp b/src/libstate/engine/gnump/gmp_wrap.cpp
index 4c73c2562..4c73c2562 100644
--- a/src/engine/gnump/gmp_wrap.cpp
+++ b/src/libstate/engine/gnump/gmp_wrap.cpp
diff --git a/src/engine/gnump/gmp_wrap.h b/src/libstate/engine/gnump/gmp_wrap.h
index e2a420e6b..e2a420e6b 100644
--- a/src/engine/gnump/gmp_wrap.h
+++ b/src/libstate/engine/gnump/gmp_wrap.h
diff --git a/src/engine/gnump/info.txt b/src/libstate/engine/gnump/info.txt
index 33fa720f5..33fa720f5 100644
--- a/src/engine/gnump/info.txt
+++ b/src/libstate/engine/gnump/info.txt
diff --git a/src/engine/info.txt b/src/libstate/engine/info.txt
index be82273f4..be82273f4 100644
--- a/src/engine/info.txt
+++ b/src/libstate/engine/info.txt
diff --git a/src/engine/openssl/bn_powm.cpp b/src/libstate/engine/openssl/bn_powm.cpp
index f54411240..f54411240 100644
--- a/src/engine/openssl/bn_powm.cpp
+++ b/src/libstate/engine/openssl/bn_powm.cpp
diff --git a/src/engine/openssl/bn_wrap.cpp b/src/libstate/engine/openssl/bn_wrap.cpp
index 4f7ea0078..4f7ea0078 100644
--- a/src/engine/openssl/bn_wrap.cpp
+++ b/src/libstate/engine/openssl/bn_wrap.cpp
diff --git a/src/engine/openssl/bn_wrap.h b/src/libstate/engine/openssl/bn_wrap.h
index e8464e74e..e8464e74e 100644
--- a/src/engine/openssl/bn_wrap.h
+++ b/src/libstate/engine/openssl/bn_wrap.h
diff --git a/src/engine/openssl/eng_ossl.h b/src/libstate/engine/openssl/eng_ossl.h
index c63179459..c63179459 100644
--- a/src/engine/openssl/eng_ossl.h
+++ b/src/libstate/engine/openssl/eng_ossl.h
diff --git a/src/engine/openssl/info.txt b/src/libstate/engine/openssl/info.txt
index 0f14ccc7d..0f14ccc7d 100644
--- a/src/engine/openssl/info.txt
+++ b/src/libstate/engine/openssl/info.txt
diff --git a/src/engine/openssl/ossl_bc.cpp b/src/libstate/engine/openssl/ossl_bc.cpp
index 1863ad477..1863ad477 100644
--- a/src/engine/openssl/ossl_bc.cpp
+++ b/src/libstate/engine/openssl/ossl_bc.cpp
diff --git a/src/engine/openssl/ossl_dh.cpp b/src/libstate/engine/openssl/ossl_dh.cpp
index 290b95622..290b95622 100644
--- a/src/engine/openssl/ossl_dh.cpp
+++ b/src/libstate/engine/openssl/ossl_dh.cpp
diff --git a/src/engine/openssl/ossl_dsa.cpp b/src/libstate/engine/openssl/ossl_dsa.cpp
index 2757234e2..2757234e2 100644
--- a/src/engine/openssl/ossl_dsa.cpp
+++ b/src/libstate/engine/openssl/ossl_dsa.cpp
diff --git a/src/engine/openssl/ossl_elg.cpp b/src/libstate/engine/openssl/ossl_elg.cpp
index 25d628ba8..25d628ba8 100644
--- a/src/engine/openssl/ossl_elg.cpp
+++ b/src/libstate/engine/openssl/ossl_elg.cpp
diff --git a/src/engine/openssl/ossl_if.cpp b/src/libstate/engine/openssl/ossl_if.cpp
index 08a43e63e..08a43e63e 100644
--- a/src/engine/openssl/ossl_if.cpp
+++ b/src/libstate/engine/openssl/ossl_if.cpp
diff --git a/src/engine/openssl/ossl_md.cpp b/src/libstate/engine/openssl/ossl_md.cpp
index 8e24c7213..8e24c7213 100644
--- a/src/engine/openssl/ossl_md.cpp
+++ b/src/libstate/engine/openssl/ossl_md.cpp
diff --git a/src/engine/openssl/ossl_nr.cpp b/src/libstate/engine/openssl/ossl_nr.cpp
index 210e2fec2..210e2fec2 100644
--- a/src/engine/openssl/ossl_nr.cpp
+++ b/src/libstate/engine/openssl/ossl_nr.cpp
diff --git a/src/engine/openssl/ossl_rc4.cpp b/src/libstate/engine/openssl/ossl_rc4.cpp
index ed5c9714f..ed5c9714f 100644
--- a/src/engine/openssl/ossl_rc4.cpp
+++ b/src/libstate/engine/openssl/ossl_rc4.cpp
diff --git a/src/pubkey/ec_dompar/ec_dompar.cpp b/src/pubkey/ec_dompar/ec_dompar.cpp
index 88a1c71e2..6cfcc0619 100644
--- a/src/pubkey/ec_dompar/ec_dompar.cpp
+++ b/src/pubkey/ec_dompar/ec_dompar.cpp
@@ -2,7 +2,6 @@
 #include <botan/ec_dompar.h>
 #include <botan/pubkey_enums.h>
 #include <botan/parsing.h>
-#include <botan/libstate.h>
 #include <botan/hex.h>
 #include <botan/pipe.h>
 
diff --git a/src/selftest/selftest.cpp b/src/selftest/selftest.cpp
index ad965fb79..b1de6702b 100644
--- a/src/selftest/selftest.cpp
+++ b/src/selftest/selftest.cpp
@@ -4,7 +4,6 @@
 *************************************************/
 
 #include <botan/selftest.h>
-#include <botan/libstate.h>
 #include <botan/lookup.h>
 
 namespace Botan {