Move almost all of the ASN.1, BER, and DER codec related code into new

module asn1

Move hex and base64 codecs into new codecs directory. Also move zlib and
bzip2 to codecs from compress.

33 files changed, 72 insertions, 0 deletions

diff --git a/src/alg_id.cpp b/src/asn1/alg_id.cpp
index 5e5db73b3..5e5db73b3 100644
--- a/src/alg_id.cpp
+++ b/src/asn1/alg_id.cpp
diff --git a/include/alg_id.h b/src/asn1/alg_id.h
index 8187fc070..8187fc070 100644
--- a/include/alg_id.h
+++ b/src/asn1/alg_id.h
diff --git a/src/asn1_alt.cpp b/src/asn1/asn1_alt.cpp
index 035f918cb..035f918cb 100644
--- a/src/asn1_alt.cpp
+++ b/src/asn1/asn1_alt.cpp
diff --git a/src/asn1_att.cpp b/src/asn1/asn1_att.cpp
index 7c16ff3a5..7c16ff3a5 100644
--- a/src/asn1_att.cpp
+++ b/src/asn1/asn1_att.cpp
diff --git a/src/asn1_dn.cpp b/src/asn1/asn1_dn.cpp
index 3fd0c09b0..3fd0c09b0 100644
--- a/src/asn1_dn.cpp
+++ b/src/asn1/asn1_dn.cpp
diff --git a/src/asn1_int.cpp b/src/asn1/asn1_int.cpp
index e837dedf0..e837dedf0 100644
--- a/src/asn1_int.cpp
+++ b/src/asn1/asn1_int.cpp
diff --git a/include/asn1_int.h b/src/asn1/asn1_int.h
index 3e0562b9c..3e0562b9c 100644
--- a/include/asn1_int.h
+++ b/src/asn1/asn1_int.h
diff --git a/src/asn1_ku.cpp b/src/asn1/asn1_ku.cpp
index 32c5944dd..32c5944dd 100644
--- a/src/asn1_ku.cpp
+++ b/src/asn1/asn1_ku.cpp
diff --git a/include/asn1_obj.h b/src/asn1/asn1_obj.h
index 67645ca08..67645ca08 100644
--- a/include/asn1_obj.h
+++ b/src/asn1/asn1_obj.h
diff --git a/src/asn1_oid.cpp b/src/asn1/asn1_oid.cpp
index 80968ed8f..80968ed8f 100644
--- a/src/asn1_oid.cpp
+++ b/src/asn1/asn1_oid.cpp
diff --git a/include/asn1_oid.h b/src/asn1/asn1_oid.h
index 73d0079a8..73d0079a8 100644
--- a/include/asn1_oid.h
+++ b/src/asn1/asn1_oid.h
diff --git a/src/asn1_str.cpp b/src/asn1/asn1_str.cpp
index 52dcdc55e..52dcdc55e 100644
--- a/src/asn1_str.cpp
+++ b/src/asn1/asn1_str.cpp
diff --git a/src/asn1_tm.cpp b/src/asn1/asn1_tm.cpp
index 7cd051af7..7cd051af7 100644
--- a/src/asn1_tm.cpp
+++ b/src/asn1/asn1_tm.cpp
diff --git a/src/ber_dec.cpp b/src/asn1/ber_dec.cpp
index c725a5af9..c725a5af9 100644
--- a/src/ber_dec.cpp
+++ b/src/asn1/ber_dec.cpp
diff --git a/include/ber_dec.h b/src/asn1/ber_dec.h
index 9fec75832..9fec75832 100644
--- a/include/ber_dec.h
+++ b/src/asn1/ber_dec.h
diff --git a/src/der_enc.cpp b/src/asn1/der_enc.cpp
index 1ab5ddd4e..1ab5ddd4e 100644
--- a/src/der_enc.cpp
+++ b/src/asn1/der_enc.cpp
diff --git a/include/der_enc.h b/src/asn1/der_enc.h
index 5b3c11489..5b3c11489 100644
--- a/include/der_enc.h
+++ b/src/asn1/der_enc.h
diff --git a/src/asn1/modinfo.txt b/src/asn1/modinfo.txt
new file mode 100644
index 000000000..03284f48b
--- /dev/null
+++ b/src/asn1/modinfo.txt
@@ -0,0 +1,23 @@
+realname "ASN.1/BER/DER module"
+
+define ASN1
+
+<add>
+alg_id.cpp
+asn1_alt.cpp
+asn1_att.cpp
+asn1_dn.cpp
+asn1_int.cpp
+asn1_ku.cpp
+asn1_oid.cpp
+asn1_str.cpp
+asn1_tm.cpp
+ber_dec.cpp
+der_enc.cpp
+alg_id.h
+asn1_int.h
+asn1_obj.h
+asn1_oid.h
+ber_dec.h
+der_enc.h
+</add>
diff --git a/src/base64.cpp b/src/codec/base64/base64.cpp
index 0e01d94f3..0e01d94f3 100644
--- a/src/base64.cpp
+++ b/src/codec/base64/base64.cpp
diff --git a/include/base64.h b/src/codec/base64/base64.h
index 0003875a6..0003875a6 100644
--- a/include/base64.h
+++ b/src/codec/base64/base64.h
diff --git a/src/codec/base64/modinfo.txt b/src/codec/base64/modinfo.txt
new file mode 100644
index 000000000..4e7b38584
--- /dev/null
+++ b/src/codec/base64/modinfo.txt
@@ -0,0 +1,10 @@
+realname "Base64 Codec"
+
+define BASE64_CODEC
+
+load_on auto
+
+<add>
+base64.cpp
+base64.h
+</add>
diff --git a/src/compress/bzip2/bzip2.cpp b/src/codec/bzip2/bzip2.cpp
index 712dacd7d..712dacd7d 100644
--- a/src/compress/bzip2/bzip2.cpp
+++ b/src/codec/bzip2/bzip2.cpp
diff --git a/src/compress/bzip2/bzip2.h b/src/codec/bzip2/bzip2.h
index 1244924ca..1244924ca 100644
--- a/src/compress/bzip2/bzip2.h
+++ b/src/codec/bzip2/bzip2.h
diff --git a/src/compress/bzip2/modinfo.txt b/src/codec/bzip2/modinfo.txt
index efedc097f..efedc097f 100644
--- a/src/compress/bzip2/modinfo.txt
+++ b/src/codec/bzip2/modinfo.txt
diff --git a/src/hex.cpp b/src/codec/hex/hex.cpp
index afb082f76..afb082f76 100644
--- a/src/hex.cpp
+++ b/src/codec/hex/hex.cpp
diff --git a/include/hex.h b/src/codec/hex/hex.h
index 0ecddb588..0ecddb588 100644
--- a/include/hex.h
+++ b/src/codec/hex/hex.h
diff --git a/src/codec/hex/modinfo.txt b/src/codec/hex/modinfo.txt
new file mode 100644
index 000000000..e0b07a552
--- /dev/null
+++ b/src/codec/hex/modinfo.txt
@@ -0,0 +1,10 @@
+realname "Hex Codec"
+
+define HEX_CODEC
+
+load_on auto
+
+<add>
+hex.cpp
+hex.h
+</add>
diff --git a/src/compress/zlib/modinfo.txt b/src/codec/zlib/modinfo.txt
index c1f1f998c..c1f1f998c 100644
--- a/src/compress/zlib/modinfo.txt
+++ b/src/codec/zlib/modinfo.txt
diff --git a/src/compress/zlib/zlib.cpp b/src/codec/zlib/zlib.cpp
index 36a9640e3..36a9640e3 100644
--- a/src/compress/zlib/zlib.cpp
+++ b/src/codec/zlib/zlib.cpp
diff --git a/src/compress/zlib/zlib.h b/src/codec/zlib/zlib.h
index c3baea4ee..c3baea4ee 100644
--- a/src/compress/zlib/zlib.h
+++ b/src/codec/zlib/zlib.h
diff --git a/src/pk/dl_algo/modinfo.txt b/src/pk/dl_algo/modinfo.txt
new file mode 100644
index 000000000..755ab8682
--- /dev/null
+++ b/src/pk/dl_algo/modinfo.txt
@@ -0,0 +1,15 @@
+realname "Discrete Logarithm PK Algorithms"
+
+define DL_PUBLIC_KEY_FAMILY
+
+load_on auto
+
+<add>
+dl_algo.cpp
+dl_algo.h
+</add>
+
+<requires>
+asn1
+dl_group
+</requires>
diff --git a/src/pk/dl_group/modinfo.txt b/src/pk/dl_group/modinfo.txt
new file mode 100644
index 000000000..4d2d6f13c
--- /dev/null
+++ b/src/pk/dl_group/modinfo.txt
@@ -0,0 +1,10 @@
+realname "DL Group"
+
+load_on auto
+
+define DL_GROUP
+
+<add>
+dl_group.cpp
+dl_group.h
+</add>
diff --git a/src/pk/dlies/modinfo.txt b/src/pk/dlies/modinfo.txt
index 995dbe8a2..163914714 100644
--- a/src/pk/dlies/modinfo.txt
+++ b/src/pk/dlies/modinfo.txt
@@ -8,3 +8,7 @@ load_on auto
 dlies.cpp
 dlies.h
 </add>
+
+<requires>
+asn1
+</requires>