Split the last parts of the 'core' module

Add some missing info.txts

36 files changed, 131 insertions, 73 deletions

diff --git a/src/alloc/info.txt b/src/alloc/info.txt
new file mode 100644
index 000000000..2430a4db4
--- /dev/null
+++ b/src/alloc/info.txt
@@ -0,0 +1,7 @@
+realname "Allocator"
+
+load_on auto
+
+<add>
+allocate.h
+</add>
diff --git a/src/alloc/mem_pool/info.txt b/src/alloc/mem_pool/info.txt
new file mode 100644
index 000000000..ec987a0e0
--- /dev/null
+++ b/src/alloc/mem_pool/info.txt
@@ -0,0 +1,12 @@
+realname "Memory Pool Allocator"
+
+load_on auto
+
+<requires>
+utils
+</requires>
+
+<add>
+mem_pool.cpp
+mem_pool.h
+</add>
diff --git a/src/alloc/system_alloc/info.txt b/src/alloc/system_alloc/info.txt
new file mode 100644
index 000000000..0e8de9ff7
--- /dev/null
+++ b/src/alloc/system_alloc/info.txt
@@ -0,0 +1,12 @@
+realname "Default (Malloc) Allocators"
+
+load_on auto
+
+<requires>
+utils
+</requires>
+
+<add>
+defalloc.cpp
+defalloc.h
+</add>
diff --git a/src/asn1/ber_dec.h b/src/asn1/ber_dec.h
index 9fec75832..1888953d1 100644
--- a/src/asn1/ber_dec.h
+++ b/src/asn1/ber_dec.h
@@ -8,7 +8,6 @@
 
 #include <botan/asn1_oid.h>
 #include <botan/data_src.h>
-#include <botan/enums.h>
 
 namespace Botan {
 
@@ -116,15 +115,6 @@ BER_Decoder& BER_Decoder::decode_list(std::vector<T>& vec, bool clear_it)
    return (*this);
    }
 
-/*************************************************
-* BER Decoding Functions                         *
-*************************************************/
-namespace BER {
-
-void BOTAN_DLL decode(BER_Decoder&, Key_Constraints&);
-
-}
-
 }
 
 #endif
diff --git a/src/asn1/info.txt b/src/asn1/info.txt
index 95d81d80c..279cbb1e9 100644
--- a/src/asn1/info.txt
+++ b/src/asn1/info.txt
@@ -15,7 +15,6 @@ asn1_alt.cpp
 asn1_att.cpp
 asn1_dn.cpp
 asn1_int.cpp
-asn1_ku.cpp
 asn1_oid.cpp
 asn1_str.cpp
 asn1_tm.cpp
diff --git a/src/block/info.txt b/src/block/info.txt
new file mode 100644
index 000000000..5df789736
--- /dev/null
+++ b/src/block/info.txt
@@ -0,0 +1,14 @@
+realname "Block Ciphers"
+
+load_on auto
+
+define BLOCK_CIPHER
+
+<requires>
+utils
+sym_algo
+</requires>
+
+<add>
+block_cipher.h
+</add>
diff --git a/src/cert/cvc/cvc_ado.h b/src/cert/cvc/cvc_ado.h
index adfdb4ecb..5b79cacd9 100644
--- a/src/cert/cvc/cvc_ado.h
+++ b/src/cert/cvc/cvc_ado.h
@@ -8,7 +8,7 @@
 #define BOTAN_EAC_CVC_ADO_H__
 
 #include <botan/x509_key.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 #include <botan/pubkey.h>
 #include <botan/ecdsa.h>
 #include <botan/eac_obj.h>
diff --git a/src/cert/cvc/cvc_cert.h b/src/cert/cvc/cvc_cert.h
index 65ee83d0e..c007a42e8 100644
--- a/src/cert/cvc/cvc_cert.h
+++ b/src/cert/cvc/cvc_cert.h
@@ -8,7 +8,7 @@
 #define BOTAN_CVC_EAC_H__
 
 #include <botan/x509_key.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 #include <botan/signed_obj.h>
 #include <botan/pubkey.h>
 #include <botan/ecdsa.h>
diff --git a/src/cert/cvc/cvc_gen_cert.h b/src/cert/cvc/cvc_gen_cert.h
index 007c80e26..ea53f7f0f 100644
--- a/src/cert/cvc/cvc_gen_cert.h
+++ b/src/cert/cvc/cvc_gen_cert.h
@@ -9,7 +9,7 @@
 
 #include <botan/x509_key.h>
 #include <botan/eac_asn_obj.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 #include <botan/pubkey.h>
 #include <botan/ecdsa_sig.h>
 #include <string>
diff --git a/src/cert/cvc/cvc_req.h b/src/cert/cvc/cvc_req.h
index 510e9b70a..484d01f25 100644
--- a/src/cert/cvc/cvc_req.h
+++ b/src/cert/cvc/cvc_req.h
@@ -8,7 +8,7 @@
 #define BOTAN_EAC_CVC_REQ_H__
 
 #include <botan/x509_key.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 #include <botan/cvc_gen_cert.h>
 #include <botan/cvc_req.h>
 
diff --git a/src/cert/cvc/eac_obj.h b/src/cert/cvc/eac_obj.h
index 3b692673d..72d897700 100644
--- a/src/cert/cvc/eac_obj.h
+++ b/src/cert/cvc/eac_obj.h
@@ -10,7 +10,7 @@
 #include <botan/pubkey.h>
 #include <botan/x509_key.h>
 #include <botan/signed_obj.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 #include <botan/pubkey.h>
 #include <botan/parsing.h>
 #include <botan/pem.h>
diff --git a/src/cert/cvc/signed_obj.h b/src/cert/cvc/signed_obj.h
index a983da610..918a20db5 100644
--- a/src/cert/cvc/signed_obj.h
+++ b/src/cert/cvc/signed_obj.h
@@ -8,7 +8,7 @@
 #define BOTAN_EAC_SIGNED_OBJECT_H__
 
 #include <botan/asn1_obj.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 #include <botan/freestore.h>
 #include <botan/pipe.h>
 #include <vector>
diff --git a/src/cert/x509/x509_ext.h b/src/cert/x509/x509_ext.h
index 5b302df0d..6b055ea29 100644
--- a/src/cert/x509/x509_ext.h
+++ b/src/cert/x509/x509_ext.h
@@ -10,7 +10,7 @@
 #include <botan/asn1_oid.h>
 #include <botan/asn1_obj.h>
 #include <botan/datastor.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 
 namespace Botan {
 
diff --git a/src/cert/x509/x509_obj.h b/src/cert/x509/x509_obj.h
index baaf5a8a4..d80560eb2 100644
--- a/src/cert/x509/x509_obj.h
+++ b/src/cert/x509/x509_obj.h
@@ -8,7 +8,7 @@
 
 #include <botan/asn1_obj.h>
 #include <botan/pipe.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 #include <botan/rng.h>
 #include <vector>
 
diff --git a/src/cert/x509/x509cert.h b/src/cert/x509/x509cert.h
index f5bd99167..c02085dcb 100644
--- a/src/cert/x509/x509cert.h
+++ b/src/cert/x509/x509cert.h
@@ -9,7 +9,7 @@
 #include <botan/x509_obj.h>
 #include <botan/x509_key.h>
 #include <botan/datastor.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 #include <map>
 
 namespace Botan {
diff --git a/src/codec/base64/base64.h b/src/codec/base64/base64.h
index 7f5c7cfc7..f59191ae0 100644
--- a/src/codec/base64/base64.h
+++ b/src/codec/base64/base64.h
@@ -7,7 +7,6 @@
 #define BOTAN_BASE64_H__
 
 #include <botan/filter.h>
-#include <botan/enums.h>
 
 namespace Botan {
 
diff --git a/src/codec/hex/hex.h b/src/codec/hex/hex.h
index 2b4c15462..bb98c8770 100644
--- a/src/codec/hex/hex.h
+++ b/src/codec/hex/hex.h
@@ -7,7 +7,6 @@
 #define BOTAN_HEX_H__
 
 #include <botan/filter.h>
-#include <botan/enums.h>
 
 namespace Botan {
 
diff --git a/src/core/info.txt b/src/core/info.txt
deleted file mode 100644
index df1d73b77..000000000
--- a/src/core/info.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-realname "Botan Core Module"
-
-load_on auto
-
-define CORE_MODULE
-
-<add>
-botan.h
-enums.h
-</add>
diff --git a/src/filters/filter.h b/src/filters/filter.h
index e6a7b6918..5be22a584 100644
--- a/src/filters/filter.h
+++ b/src/filters/filter.h
@@ -96,6 +96,14 @@ class BOTAN_DLL Fanout_Filter : public Filter
       void attach(Filter* f) { Filter::attach(f); }
    };
 
+/**
+* The type of checking to be performed by decoders:
+* NONE - no checks, IGNORE_WS - perform checks, but ignore
+* whitespaces, FULL_CHECK - perform checks, also complain
+* about white spaces.
+*/
+enum Decoder_Checking { NONE, IGNORE_WS, FULL_CHECK };
+
 }
 
 #endif
diff --git a/src/libstate/engine.h b/src/libstate/engine.h
index 6c0fa93ad..d7fae2348 100644
--- a/src/libstate/engine.h
+++ b/src/libstate/engine.h
@@ -14,7 +14,6 @@
 #include <botan/mutex.h>
 #include <botan/pow_mod.h>
 #include <botan/basefilt.h>
-#include <botan/enums.h>
 #include <utility>
 #include <map>
 
diff --git a/src/libstate/lookup.h b/src/libstate/lookup.h
index ac65799da..051bbd801 100644
--- a/src/libstate/lookup.h
+++ b/src/libstate/lookup.h
@@ -12,7 +12,6 @@
 #include <botan/mac.h>
 #include <botan/s2k.h>
 
-#include <botan/enums.h>
 #include <botan/filters.h>
 #include <botan/mode_pad.h>
 #include <botan/kdf.h>
diff --git a/src/pbe/pbes1/pbes1.h b/src/pbe/pbes1/pbes1.h
index 89d611b4e..78363c68b 100644
--- a/src/pbe/pbes1/pbes1.h
+++ b/src/pbe/pbes1/pbes1.h
@@ -7,8 +7,8 @@
 #define BOTAN_PBE_PKCS_V15_H__
 
 #include <botan/pbe.h>
+#include <botan/sym_algo.h>
 #include <botan/pipe.h>
-#include <botan/enums.h>
 
 namespace Botan {
 
diff --git a/src/pbe/pbes2/pbes2.h b/src/pbe/pbes2/pbes2.h
index 36ba67b01..6a859f814 100644
--- a/src/pbe/pbes2/pbes2.h
+++ b/src/pbe/pbes2/pbes2.h
@@ -7,8 +7,8 @@
 #define BOTAN_PBE_PKCS_v20_H__
 
 #include <botan/pbe.h>
+#include <botan/sym_algo.h>
 #include <botan/pipe.h>
-#include <botan/enums.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/ec_dompar/ec_dompar.cpp b/src/pubkey/ec_dompar/ec_dompar.cpp
index cf6ef8fab..88a1c71e2 100644
--- a/src/pubkey/ec_dompar/ec_dompar.cpp
+++ b/src/pubkey/ec_dompar/ec_dompar.cpp
@@ -1,6 +1,6 @@
 
 #include <botan/ec_dompar.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 #include <botan/parsing.h>
 #include <botan/libstate.h>
 #include <botan/hex.h>
diff --git a/src/pubkey/ec_dompar/ec_dompar.h b/src/pubkey/ec_dompar/ec_dompar.h
index bda19ec86..9abfafdb4 100644
--- a/src/pubkey/ec_dompar/ec_dompar.h
+++ b/src/pubkey/ec_dompar/ec_dompar.h
@@ -14,7 +14,7 @@
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/alg_id.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/pubkey/info.txt b/src/pubkey/pubkey/info.txt
index 9a8766790..71d56e17e 100644
--- a/src/pubkey/pubkey/info.txt
+++ b/src/pubkey/pubkey/info.txt
@@ -15,6 +15,8 @@ rng
 </requires>
 
 <add>
+pubkey_enums.h
+pubkey_enums.cpp
 pk_keys.cpp
 pk_keys.h
 pkcs8.cpp
diff --git a/src/pubkey/pubkey/pkcs8.h b/src/pubkey/pubkey/pkcs8.h
index 0598e7c68..863a80b86 100644
--- a/src/pubkey/pubkey/pkcs8.h
+++ b/src/pubkey/pubkey/pkcs8.h
@@ -8,7 +8,6 @@
 
 #include <botan/x509_key.h>
 #include <botan/ui.h>
-#include <botan/enums.h>
 
 namespace Botan {
 
diff --git a/src/asn1/asn1_ku.cpp b/src/pubkey/pubkey/pubkey_enums.cpp
index 32c5944dd..fd230d6f4 100644
--- a/src/asn1/asn1_ku.cpp
+++ b/src/pubkey/pubkey/pubkey_enums.cpp
@@ -3,8 +3,7 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#include <botan/asn1_obj.h>
-#include <botan/der_enc.h>
+#include <botan/pubkey_enums.h>
 #include <botan/ber_dec.h>
 
 namespace Botan {
diff --git a/src/core/enums.h b/src/pubkey/pubkey/pubkey_enums.h
index f86c0105d..eaed24921 100644
--- a/src/core/enums.h
+++ b/src/pubkey/pubkey/pubkey_enums.h
@@ -6,7 +6,7 @@
 #ifndef BOTAN_ENUMS_H__
 #define BOTAN_ENUMS_H__
 
-#include <botan/types.h>
+#include <botan/ber_dec.h>
 
 namespace Botan {
 
@@ -27,6 +27,15 @@ enum Key_Constraints {
 };
 
 /**
+* BER Decoding Function for key constraints
+*/
+namespace BER {
+
+void BOTAN_DLL decode(BER_Decoder&, Key_Constraints&);
+
+}
+
+/**
 * X.509v2 CRL Reason Code.
 */
 enum CRL_Code {
@@ -51,35 +60,11 @@ enum CRL_Code {
 *************************************************/
 
 /**
-* The type of checking to be performed:
-* NONE - no checks, IGNORE_WS - perform checks, but ignore
-* whitespaces, FULL_CHECK - perform checks, also complain
-* about white spaces.
-*/
-enum Decoder_Checking { NONE, IGNORE_WS, FULL_CHECK };
-
-/**
 * The two types of X509 encoding supported by Botan.
 */
 enum X509_Encoding { RAW_BER, PEM };
 
 /**
-* The two possible directions for cipher filters, determining whether they
-* actually perform encryption or decryption.
-*/
-enum Cipher_Dir { ENCRYPTION, DECRYPTION };
-
-/**
-* The different charsets supported by Botan.
-*/
-enum Character_Set {
-   LOCAL_CHARSET,
-   UCS2_CHARSET,
-   UTF8_CHARSET,
-   LATIN1_CHARSET
-};
-
-/**
 * Value to encode in case of no path limit in the X509
 * BasicConstraints extension.
 */
diff --git a/src/pubkey/pubkey/x509_key.h b/src/pubkey/pubkey/x509_key.h
index b407342e6..b60a3af05 100644
--- a/src/pubkey/pubkey/x509_key.h
+++ b/src/pubkey/pubkey/x509_key.h
@@ -9,7 +9,7 @@
 #include <botan/pipe.h>
 #include <botan/pk_keys.h>
 #include <botan/alg_id.h>
-#include <botan/enums.h>
+#include <botan/pubkey_enums.h>
 
 namespace Botan {
 
diff --git a/src/stream/info.txt b/src/stream/info.txt
new file mode 100644
index 000000000..b3d9649db
--- /dev/null
+++ b/src/stream/info.txt
@@ -0,0 +1,15 @@
+realname "Stream Ciphers"
+
+load_on auto
+
+define STREAM_CIPHER
+
+<requires>
+utils
+sym_algo
+</requires>
+
+<add>
+stream_cipher.h
+stream_cipher.cpp
+</add>
diff --git a/src/sym_algo/info.txt b/src/sym_algo/info.txt
new file mode 100644
index 000000000..3f3adfd96
--- /dev/null
+++ b/src/sym_algo/info.txt
@@ -0,0 +1,13 @@
+realname "Symmetric Algorithms"
+
+load_on auto
+
+<requires>
+rng
+</requires>
+
+<add>
+sym_algo.h
+symkey.cpp
+symkey.h
+</add>
diff --git a/src/sym_algo/sym_algo.h b/src/sym_algo/sym_algo.h
index 02343ed56..dbefbe4ca 100644
--- a/src/sym_algo/sym_algo.h
+++ b/src/sym_algo/sym_algo.h
@@ -88,6 +88,12 @@ class BOTAN_DLL SymmetricAlgorithm
       virtual void key(const byte[], u32bit) = 0;
    };
 
+/**
+* The two possible directions for cipher filters, determining whether they
+* actually perform encryption or decryption.
+*/
+enum Cipher_Dir { ENCRYPTION, DECRYPTION };
+
 }
 
 #endif
diff --git a/src/core/botan.h b/src/utils/botan.h
index c7109aaa5..1149fe063 100644
--- a/src/core/botan.h
+++ b/src/utils/botan.h
@@ -1,14 +1,15 @@
-/*************************************************
-* Botan Core Interface Header File               *
-* (C) 1999-2007 Jack Lloyd                       *
-*************************************************/
+/**
+* A vague catch all include file for Botan
+* (C) 1999-2007 Jack Lloyd
+*/
 
 #include <botan/init.h>
 #include <botan/lookup.h>
-#include <botan/rng.h>
 #include <botan/version.h>
 #include <botan/parsing.h>
 
+#include <botan/rng.h>
+
 #if defined(BOTAN_HAS_AUTO_SEEDING_RNG)
   #include <botan/auto_rng.h>
 #endif
diff --git a/src/utils/charset.h b/src/utils/charset.h
index ac9f501a0..25827c8a7 100644
--- a/src/utils/charset.h
+++ b/src/utils/charset.h
@@ -7,11 +7,20 @@
 #define BOTAN_CHARSET_H__
 
 #include <botan/types.h>
-#include <botan/enums.h>
 #include <string>
 
 namespace Botan {
 
+/**
+* The different charsets (nominally) supported by Botan.
+*/
+enum Character_Set {
+   LOCAL_CHARSET,
+   UCS2_CHARSET,
+   UTF8_CHARSET,
+   LATIN1_CHARSET
+};
+
 namespace Charset {
 
 /*************************************************
diff --git a/src/utils/info.txt b/src/utils/info.txt
index 4999a08e7..5fad7127b 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -14,6 +14,7 @@ filters
 
 <add>
 bit_ops.h
+botan.h
 bswap.h
 buf_comp.h
 charset.cpp