aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorTomas Kukosa <tomas.kukosa@siemens.com>2006-05-24 12:24:54 +0000
committerTomas Kukosa <tomas.kukosa@siemens.com>2006-05-24 12:24:54 +0000
commit604000a6b39623daff9eef80c913b5ff5e9e3092 (patch)
treef1643eec5c079fab682290e8a985b6aa4eb3d629 /asn1
parentd17dad9eada5e0e2b6234d1da715e7376d5034b5 (diff)
- remove some #.MODULE_IMPORT from .cng files
- regenerate BER dissectors so as to change rest of Ethereal->Wireshark and asn2eth -> asn2wrs svn path=/trunk/; revision=18217
Diffstat (limited to 'asn1')
-rw-r--r--asn1/acp133/acp133.cnf9
-rw-r--r--asn1/acse/acse.cnf3
-rw-r--r--asn1/cmip/cmip.cnf3
-rw-r--r--asn1/cms/cms.cnf4
-rw-r--r--asn1/dap/dap.cnf26
-rw-r--r--asn1/disp/disp.cnf6
-rw-r--r--asn1/dop/dop.cnf11
-rw-r--r--asn1/dsp/dsp.cnf6
-rw-r--r--asn1/ess/ess.cnf5
-rw-r--r--asn1/ftam/ftam.cnf3
-rw-r--r--asn1/ftbp/ftbp.cnf3
-rw-r--r--asn1/gsm_ss/gsm_ss.cnf4
-rw-r--r--asn1/logotype-cert-extn/logotype-cert-extn.cnf3
-rw-r--r--asn1/ocsp/ocsp.cnf2
-rw-r--r--asn1/pkcs1/pkcs1.cnf3
-rw-r--r--asn1/pkinit/pkinit.cnf1
-rw-r--r--asn1/pkix1implicit/pkix1implicit.cnf1
-rw-r--r--asn1/pkixcrmf/crmf.cnf1
-rw-r--r--asn1/pkixqualified/pkixqualified.cnf5
-rw-r--r--asn1/pkixtsp/pkixtsp.cnf1
-rw-r--r--asn1/pres/pres.cnf3
-rw-r--r--asn1/s4406/s4406.cnf1
-rw-r--r--asn1/x411/x411.cnf6
-rw-r--r--asn1/x420/x420.cnf3
-rw-r--r--asn1/x509af/x509af.cnf5
-rw-r--r--asn1/x509ce/x509ce.cnf3
-rw-r--r--asn1/x509if/x509if.cnf3
-rw-r--r--asn1/x509sat/x509sat.cnf3
28 files changed, 14 insertions, 113 deletions
diff --git a/asn1/acp133/acp133.cnf b/asn1/acp133/acp133.cnf
index a2c7998f66..740d26c18c 100644
--- a/asn1/acp133/acp133.cnf
+++ b/asn1/acp133/acp133.cnf
@@ -1,17 +1,14 @@
# acp133.cnf
# ACP133 conformation file
-#.MODULE_IMPORT
-CertificateExtensions x509ce
-AuthenticationFramework x509af
-InformationFramework x509if
-MTSAbstractService x411
-
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x411/x411-exp.cnf
+#.MODULE_IMPORT
+MTSAbstractService x411
+
#.PDU
ACPPreferredDelivery
ALType
diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf
index d841f4937b..4ac0e7424b 100644
--- a/asn1/acse/acse.cnf
+++ b/asn1/acse/acse.cnf
@@ -3,9 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-InformationFramework x509if
-
#.INCLUDE ../x509if/x509if-exp.cnf
#.EXPORTS
diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf
index c1c0a6a000..ffb6f95991 100644
--- a/asn1/cmip/cmip.cnf
+++ b/asn1/cmip/cmip.cnf
@@ -3,9 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-ACSE-1 acse
-
#.INCLUDE ../acse/acse-exp.cnf
#.EXPORTS
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf
index 5414cc51a4..bfb002e3dc 100644
--- a/asn1/cms/cms.cnf
+++ b/asn1/cms/cms.cnf
@@ -3,10 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-AuthenticationFramework x509af
-InformationFramework x509if
-
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf
index 3c82a0a64b..5e5338433e 100644
--- a/asn1/dap/dap.cnf
+++ b/asn1/dap/dap.cnf
@@ -1,29 +1,21 @@
+#.INCLUDE ../x509if/x509if-exp.cnf
+#.INCLUDE ../x509af/x509af-exp.cnf
+#.INCLUDE ../x509sat/x509sat-exp.cnf
+#.INCLUDE ../pkixcrmf/crmf-exp.cnf
+#.INCLUDE ../dsp/dsp-exp.cnf
+#.INCLUDE ../disp/disp-exp.cnf
+#.INCLUDE ../ros/ros-exp.cnf
+#.INCLUDE ../acse/acse-exp.cnf
+
#.MODULE_IMPORT
-InformationFramework x509if
ServiceAdministration x509if
-AuthenticationFramework x509af
AttributeCertificateDefinitions x509af
-SelectedAttributeTypes x509sat
-
BasicAccessControl crmf
-Remote-Operations-Generic-ROS-PDUs ros
Remote-Operations-Information-Objects ros
-ACSE-1 acse
-DistributedOperations dsp
-DirectoryShadowAbstractService disp
-
-#.INCLUDE ../x509if/x509if-exp.cnf
-#.INCLUDE ../x509af/x509af-exp.cnf
-#.INCLUDE ../x509sat/x509sat-exp.cnf
-#.INCLUDE ../pkixcrmf/crmf-exp.cnf
-#.INCLUDE ../dsp/dsp-exp.cnf
-#.INCLUDE ../disp/disp-exp.cnf
-#.INCLUDE ../ros/ros-exp.cnf
-#.INCLUDE ../acse/acse-exp.cnf
#.EXPORTS
Filter
diff --git a/asn1/disp/disp.cnf b/asn1/disp/disp.cnf
index f8fe639e3d..058d99a911 100644
--- a/asn1/disp/disp.cnf
+++ b/asn1/disp/disp.cnf
@@ -2,12 +2,6 @@
Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
#.MODULE_IMPORT
-InformationFramework x509if
-AuthenticationFramework x509af
-ACSE-1 acse
-DirectoryAbstractService dap
-DistributedOperations dsp
-DSAOperationalAttributeTypes dop
OperationalBindingManagement dop
#.INCLUDE ../x509if/x509if-exp.cnf
diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf
index 99e6cd83e2..11b3e96ce8 100644
--- a/asn1/dop/dop.cnf
+++ b/asn1/dop/dop.cnf
@@ -1,12 +1,3 @@
-#.MODULE_IMPORT
-SelectedAttributeTypes x509sat
-DistributedOperations dsp
-DirectoryAbstractService dap
-InformationFramework x509if
-AuthenticationFramework x509af
-BasicAccessControl crmf
-ACSE-1 acse
-
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
@@ -15,6 +6,8 @@ ACSE-1 acse
#.INCLUDE ../pkixcrmf/crmf-exp.cnf
#.INCLUDE ../acse/acse-exp.cnf
+#.MODULE_IMPORT
+BasicAccessControl crmf
#.EXPORTS
DSEType
diff --git a/asn1/dsp/dsp.cnf b/asn1/dsp/dsp.cnf
index cef3b69c97..45e339459a 100644
--- a/asn1/dsp/dsp.cnf
+++ b/asn1/dsp/dsp.cnf
@@ -1,12 +1,6 @@
#.MODULE_IMPORT
-DirectoryAbstractService dap
DirectoryAccessProtocol dap
-ACSE-1 acse
-InformationFramework x509if
ServiceAdministration x509if
-AuthenticationFramework x509af
-
-SelectedAttributeTypes x509sat
#.INCLUDE ../dap/dap-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
diff --git a/asn1/ess/ess.cnf b/asn1/ess/ess.cnf
index e788eced90..03e7ea579e 100644
--- a/asn1/ess/ess.cnf
+++ b/asn1/ess/ess.cnf
@@ -3,11 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-AuthenticationFramework x509af
-CertificateExtensions x509ce
-CryptographicMessageSyntax cms
-
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.INCLUDE ../cms/cms-exp.cnf
diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf
index 805d4329f3..2ea870f35e 100644
--- a/asn1/ftam/ftam.cnf
+++ b/asn1/ftam/ftam.cnf
@@ -3,9 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-ACSE-1 acse
-
#.INCLUDE ../acse/acse-exp.cnf
#.EXPORTS
diff --git a/asn1/ftbp/ftbp.cnf b/asn1/ftbp/ftbp.cnf
index 39d0b75680..3cf87213a1 100644
--- a/asn1/ftbp/ftbp.cnf
+++ b/asn1/ftbp/ftbp.cnf
@@ -1,7 +1,4 @@
#.MODULE_IMPORT
-ISO8571-FTAM ftam
-ACSE-1 acse
-IPMSInformationObjects x420
MTSAbstractService x411
#.INCLUDE ../ftam/ftam-exp.cnf
diff --git a/asn1/gsm_ss/gsm_ss.cnf b/asn1/gsm_ss/gsm_ss.cnf
index d81ec1ddf9..c8017b1ce0 100644
--- a/asn1/gsm_ss/gsm_ss.cnf
+++ b/asn1/gsm_ss/gsm_ss.cnf
@@ -3,10 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-
-MAP-Protocol gsm_map
-
#.INCLUDE ../gsmmap/gsm_map-exp.cnf
#.EXPORTS
diff --git a/asn1/logotype-cert-extn/logotype-cert-extn.cnf b/asn1/logotype-cert-extn/logotype-cert-extn.cnf
index 4fbad7b968..e30bf6845d 100644
--- a/asn1/logotype-cert-extn/logotype-cert-extn.cnf
+++ b/asn1/logotype-cert-extn/logotype-cert-extn.cnf
@@ -3,9 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-AuthenticationFramework x509af
-
#.INCLUDE ../x509af/x509af-exp.cnf
#.EXPORTS
diff --git a/asn1/ocsp/ocsp.cnf b/asn1/ocsp/ocsp.cnf
index 1f61c4372d..1403eb688b 100644
--- a/asn1/ocsp/ocsp.cnf
+++ b/asn1/ocsp/ocsp.cnf
@@ -4,8 +4,6 @@
# $Id$
#.MODULE_IMPORT
-AuthenticationFramework x509af
-CertificateExtensions x509ce
PKIX1Implicit88 pkix1implicit
PKIX1Explicit88 pkix1explicit
diff --git a/asn1/pkcs1/pkcs1.cnf b/asn1/pkcs1/pkcs1.cnf
index 5355fd96c0..53b8b16354 100644
--- a/asn1/pkcs1/pkcs1.cnf
+++ b/asn1/pkcs1/pkcs1.cnf
@@ -3,9 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-AuthenticationFramework x509af
-
#.INCLUDE ../x509af/x509af-exp.cnf
#.EXPORTS
diff --git a/asn1/pkinit/pkinit.cnf b/asn1/pkinit/pkinit.cnf
index 4918190300..dd7aa3b5fe 100644
--- a/asn1/pkinit/pkinit.cnf
+++ b/asn1/pkinit/pkinit.cnf
@@ -5,7 +5,6 @@
#.MODULE_IMPORT
PKIX1Explicit88 pkix1explicit
-CryptographicMessageSyntax cms
#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
#.INCLUDE ../cms/cms-exp.cnf
diff --git a/asn1/pkix1implicit/pkix1implicit.cnf b/asn1/pkix1implicit/pkix1implicit.cnf
index 7aea434712..122453e4a8 100644
--- a/asn1/pkix1implicit/pkix1implicit.cnf
+++ b/asn1/pkix1implicit/pkix1implicit.cnf
@@ -5,7 +5,6 @@
#.MODULE_IMPORT
PKIX1Explicit93 pkix1explicit
-CertificateExtensions x509ce
#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
#.INCLUDE ../x509ce/x509ce-exp.cnf
diff --git a/asn1/pkixcrmf/crmf.cnf b/asn1/pkixcrmf/crmf.cnf
index e7b77cef0a..969a2c9d2f 100644
--- a/asn1/pkixcrmf/crmf.cnf
+++ b/asn1/pkixcrmf/crmf.cnf
@@ -4,7 +4,6 @@
# $Id$
#.MODULE_IMPORT
-CryptographicMessageSyntax cms
PKIX1Explicit88 pkix1explicit
PKIX1Implicit88 pkix1implicit
diff --git a/asn1/pkixqualified/pkixqualified.cnf b/asn1/pkixqualified/pkixqualified.cnf
index 3307a6fc67..51231f1ad2 100644
--- a/asn1/pkixqualified/pkixqualified.cnf
+++ b/asn1/pkixqualified/pkixqualified.cnf
@@ -3,11 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-CertificateExtensions x509ce
-AuthenticationFramework x509af
-SelectedAttributeTypes x509sat
-
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
#.INCLUDE ../x509sat/x509sat-exp.cnf
diff --git a/asn1/pkixtsp/pkixtsp.cnf b/asn1/pkixtsp/pkixtsp.cnf
index 9f9b81e8c4..27fe469d1b 100644
--- a/asn1/pkixtsp/pkixtsp.cnf
+++ b/asn1/pkixtsp/pkixtsp.cnf
@@ -6,7 +6,6 @@
#.MODULE_IMPORT
PKIX1Explicit88 pkix1explicit
PKIX1Implicit88 pkix1implicit
-CryptographicMessageSyntax cms
#.INCLUDE ../pkix1explicit/pkix1explicit_exp.cnf
#.INCLUDE ../pkix1implicit/pkix1implicit_exp.cnf
diff --git a/asn1/pres/pres.cnf b/asn1/pres/pres.cnf
index dcae453ddb..303d5e49c2 100644
--- a/asn1/pres/pres.cnf
+++ b/asn1/pres/pres.cnf
@@ -3,9 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-Reliable-Transfer-APDU rtse
-
#.INCLUDE ../rtse/rtse-exp.cnf
#.EXPORTS
diff --git a/asn1/s4406/s4406.cnf b/asn1/s4406/s4406.cnf
index 69ff66db9f..39c927a876 100644
--- a/asn1/s4406/s4406.cnf
+++ b/asn1/s4406/s4406.cnf
@@ -1,6 +1,5 @@
#.MODULE_IMPORT
MTSAbstractService x411
-IPMSInformationObjects x420
#.INCLUDE ../x411/x411-exp.cnf
#.INCLUDE ../x420/x420-exp.cnf
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf
index d863933fbe..19a636c093 100644
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@@ -2,12 +2,6 @@
CountryName TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x411_CountryName_vals) BITMASK = 0
Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
-#.MODULE_IMPORT
-InformationFramework x509if
-CertificateExtensions x509ce
-SelectedAttributeTypes x509sat
-AuthenticationFramework x509af
-
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509sat/x509sat-exp.cnf
diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf
index 9eed9c8f3d..7768873e5a 100644
--- a/asn1/x420/x420.cnf
+++ b/asn1/x420/x420.cnf
@@ -3,9 +3,6 @@ Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0
#.MODULE_IMPORT
MTSAbstractService x411
-AuthenticationFramework x509af
-CertificateExtensions x509ce
-ACSE-1 acse
#.INCLUDE ../x411/x411-exp.cnf
#.INCLUDE ../x509af/x509af-exp.cnf
diff --git a/asn1/x509af/x509af.cnf b/asn1/x509af/x509af.cnf
index 8453660909..e0cf45e4d2 100644
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@@ -3,11 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-InformationFramework x509if
-CertificateExtensions x509ce
-SelectedAttributeTypes x509sat
-
#.INCLUDE ../x509ce/x509ce-exp.cnf
#.INCLUDE ../x509if/x509if-exp.cnf
#.INCLUDE ../x509sat/x509sat-exp.cnf
diff --git a/asn1/x509ce/x509ce.cnf b/asn1/x509ce/x509ce.cnf
index 45242c4f1f..50fe50b073 100644
--- a/asn1/x509ce/x509ce.cnf
+++ b/asn1/x509ce/x509ce.cnf
@@ -4,9 +4,6 @@
# $Id$
#.MODULE_IMPORT
-InformationFramework x509if
-AuthenticationFramework x509af
-SelectedAttributeTypes x509sat
MTSAbstractService x411
#.INCLUDE ../x509if/x509if-exp.cnf
diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf
index 66bfd93c19..e4f96c29a3 100644
--- a/asn1/x509if/x509if.cnf
+++ b/asn1/x509if/x509if.cnf
@@ -3,9 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-SelectedAttributeTypes x509sat
-
#.INCLUDE ../x509sat/x509sat-exp.cnf
#.EXPORTS
diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf
index 0b8aa7afcf..8424ff7ba8 100644
--- a/asn1/x509sat/x509sat.cnf
+++ b/asn1/x509sat/x509sat.cnf
@@ -3,9 +3,6 @@
# $Id$
-#.MODULE_IMPORT
-InformationFramework x509if
-
#.INCLUDE ../x509if/x509if-exp.cnf
#.EXPORTS
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 18:00:48 +0000