Move oids.h to oid_lookup. Allows for much smaller build by disabling asn1

11 files changed, 50 insertions, 21 deletions

diff --git a/src/asn1/info.txt b/src/asn1/info.txt
index e923bd1d8..95d81d80c 100644
--- a/src/asn1/info.txt
+++ b/src/asn1/info.txt
@@ -6,6 +6,7 @@ load_on auto
 
 <requires>
 bigint
+oid_lookup
 </requires>
 
 <add>
diff --git a/src/cert/x509/info.txt b/src/cert/x509/info.txt
index 61baf51c9..98b7afb98 100644
--- a/src/cert/x509/info.txt
+++ b/src/cert/x509/info.txt
@@ -4,6 +4,14 @@ define X509
 
 load_on auto
 
+<requires>
+asn1
+bigint
+pubkey
+pk_lookup
+oid_lookup
+</requires>
+
 <add>
 certstor.h
 certstor.cpp
@@ -29,10 +37,3 @@ x509self.h
 x509stor.cpp
 x509stor.h
 </add>
-
-<requires>
-asn1
-bigint
-pubkey
-pk_lookup
-</requires>
diff --git a/src/cms/info.txt b/src/cms/info.txt
index b056aaa95..7399eb85e 100644
--- a/src/cms/info.txt
+++ b/src/cms/info.txt
@@ -4,6 +4,15 @@ define CMS
 
 load_on auto
 
+<requires>
+asn1
+filters
+oid_lookup
+pk_lookup
+pubkey
+x509
+</requires>
+
 <add>
 cms_algo.cpp
 cms_comp.cpp
@@ -14,11 +23,3 @@ cms_ealg.cpp
 cms_enc.cpp
 cms_enc.h
 </add>
-
-<requires>
-asn1
-filters
-pk_lookup
-pubkey
-x509
-</requires>
diff --git a/src/core/libstate/info.txt b/src/core/libstate/info.txt
index 59f318a95..38e3d1352 100644
--- a/src/core/libstate/info.txt
+++ b/src/core/libstate/info.txt
@@ -4,6 +4,11 @@ load_on auto
 
 define LIBSTATE_MODULE
 
+<required>
+core
+bigint
+</required>
+
 <add>
 def_alg.cpp
 def_mode.cpp
@@ -23,7 +28,5 @@ lookup.cpp
 lookup.h
 modules.cpp
 modules.h
-oids.cpp
-oids.h
 policy.cpp
 </add>
diff --git a/src/core/oid_lookup/info.txt b/src/core/oid_lookup/info.txt
new file mode 100644
index 000000000..6f0c9fd3c
--- /dev/null
+++ b/src/core/oid_lookup/info.txt
@@ -0,0 +1,15 @@
+realname "OID Lookup"
+
+load_on dep
+
+define OID_LOOKUP
+
+<required>
+libstate
+asn1
+</required>
+
+<add>
+oids.cpp
+oids.h
+</add>
diff --git a/src/core/libstate/oids.cpp b/src/core/oid_lookup/oids.cpp
index 0823625ea..0823625ea 100644
--- a/src/core/libstate/oids.cpp
+++ b/src/core/oid_lookup/oids.cpp
diff --git a/src/core/libstate/oids.h b/src/core/oid_lookup/oids.h
index b5be0e01f..b5be0e01f 100644
--- a/src/core/libstate/oids.h
+++ b/src/core/oid_lookup/oids.h
diff --git a/src/kdf/x942/info.txt b/src/kdf/x942/info.txt
index 32057fe94..096745dce 100644
--- a/src/kdf/x942/info.txt
+++ b/src/kdf/x942/info.txt
@@ -4,6 +4,11 @@ define X942_PRF
 
 load_on auto
 
+<requires>
+core
+oid_lookup
+</requires>
+
 <add>
 prf_x942.cpp
 prf_x942.h
diff --git a/src/pbe/pbe_base/info.txt b/src/pbe/pbe_base/info.txt
index 996f7caf0..9a46c3a11 100644
--- a/src/pbe/pbe_base/info.txt
+++ b/src/pbe/pbe_base/info.txt
@@ -7,6 +7,7 @@ define PASSWORD_BASED_ENCRYPTION
 <requires>
 filters
 asn1
+oid_lookup
 </requires>
 
 <add>
diff --git a/src/pbe/pbes2/info.txt b/src/pbe/pbes2/info.txt
index e1e5807c2..17c6d1eed 100644
--- a/src/pbe/pbes2/info.txt
+++ b/src/pbe/pbes2/info.txt
@@ -4,11 +4,12 @@ define PBE_PKCS_V20
 
 load_on auto
 
+<requires>
+oid_lookup
+pbe_base
+</requires>
+
 <add>
 pbes2.cpp
 pbes2.h
 </add>
-
-<requires>
-pbe_base
-</requires>
diff --git a/src/pubkey/pubkey/info.txt b/src/pubkey/pubkey/info.txt
index 38898cb8f..c6c57ca98 100644
--- a/src/pubkey/pubkey/info.txt
+++ b/src/pubkey/pubkey/info.txt
@@ -9,6 +9,7 @@ asn1
 bigint
 numbertheory
 pbe_base
+oid_lookup
 </requires>
 
 <add>