aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Kukosa <tomas.kukosa@siemens.com>2006-05-23 15:17:14 +0000
committerTomas Kukosa <tomas.kukosa@siemens.com>2006-05-23 15:17:14 +0000
commit55600fb60adbd522e512b278d1da2b88dfa14039 (patch)
treea465a11fa554bd6640bc084ce1421b6569125078
parent8bb127d1c1a97aa10b755c9a83488b4aa3b7a5dd (diff)
Ethereal -> Wireshark
asn2eth -> asn2wrs svn path=/trunk/; revision=18214
-rw-r--r--asn1/acse/acse-exp.cnf9
-rw-r--r--asn1/acse/acse.asn32
-rw-r--r--asn1/acse/acse.cnf2
-rw-r--r--asn1/acse/packet-acse-template.c4
-rw-r--r--asn1/ansi_map/README4
-rw-r--r--asn1/ansi_map/packet-ansi_map-template.c2
-rw-r--r--asn1/ansi_map/packet-ansi_map-template.h2
-rw-r--r--asn1/cdt/cdt-exp.cnf9
-rw-r--r--asn1/cmip/cmip-exp.cnf9
-rw-r--r--asn1/cms/CryptographicMessageSyntax.asn2
-rw-r--r--asn1/cms/cms-exp.cnf9
-rw-r--r--asn1/cms/packet-cms-template.c2
-rw-r--r--asn1/dap/dap-exp.cnf9
-rw-r--r--asn1/disp/disp-exp.cnf9
-rw-r--r--asn1/dop/dop-exp.cnf9
-rw-r--r--asn1/dsp/dsp-exp.cnf9
-rw-r--r--asn1/ess/ExtendedSecurityServices.asn2
-rw-r--r--asn1/ftam/ISO8571-FTAM.asn76
-rw-r--r--asn1/ftam/ftam-exp.cnf9
-rw-r--r--asn1/ftam/ftam.cnf74
-rw-r--r--asn1/gsmmap/GSMMAP.asn8
-rw-r--r--asn1/gsmmap/gsm_map-exp.cnf4
-rw-r--r--asn1/gsmmap/packet-gsm_map-template.c18
-rw-r--r--asn1/h225/h225.asn2
-rw-r--r--asn1/h225/packet-h225-template.c2
-rw-r--r--asn1/h225/packet-h225-template.h2
-rw-r--r--asn1/h235/H235-SECURITY-MESSAGES.asn2
-rw-r--r--asn1/h235/H235-SRTP.asn2
-rw-r--r--asn1/h245/packet-h245-template.c2
-rw-r--r--asn1/h248/MEGACO.asn2
-rw-r--r--asn1/h450/h4501.asn10
-rw-r--r--asn1/h450/packet-h450-template.c2
-rw-r--r--asn1/ldap/README4
-rw-r--r--asn1/ldap/ldap.cnf2
-rw-r--r--asn1/ldap/packet-ldap-template.c6
-rw-r--r--asn1/logotype-cert-extn/LogotypeCertExtn.asn4
-rw-r--r--asn1/mms/mms-exp.cnf9
-rw-r--r--asn1/mms/mms.asn4
-rw-r--r--asn1/ocsp/OCSP.asn2
-rw-r--r--asn1/pkinit/PKINIT.asn4
-rw-r--r--asn1/pkix1explicit/PKIX1EXPLICIT93.asn2
-rw-r--r--asn1/pkix1explicit/packet-pkix1explicit-template.c2
-rw-r--r--asn1/pkix1explicit/pkix1explicit-exp.cnf9
-rw-r--r--asn1/pkix1implicit/PKIX1IMPLICIT93.asn2
-rw-r--r--asn1/pkix1implicit/pkix1implicit-exp.cnf9
-rw-r--r--asn1/pkixcmp/CMP.asn2
-rw-r--r--asn1/pkixcmp/cmp-exp.cnf9
-rw-r--r--asn1/pkixcrmf/CRMF.asn2
-rw-r--r--asn1/pkixcrmf/crmf-exp.cnf9
-rw-r--r--asn1/pkixproxy/PKIXProxy.asn2
-rw-r--r--asn1/pkixqualified/PKIXqualified.asn2
-rw-r--r--asn1/pkixtsp/PKIXTSP.asn2
-rw-r--r--asn1/ranap/ranap.asn2
-rw-r--r--asn1/ros/packet-ros-template.c2
-rw-r--r--asn1/ros/ros-exp.cnf9
-rw-r--r--asn1/rtse/packet-rtse-template.c2
-rw-r--r--asn1/rtse/rtse-exp.cnf9
-rw-r--r--asn1/rtse/rtse.asn6
-rw-r--r--asn1/rtse/rtse.cnf2
-rw-r--r--asn1/snmp/README.txt4
-rw-r--r--asn1/snmp/packet-snmp-template.c6
-rw-r--r--asn1/snmp/snmp.cnf18
-rw-r--r--asn1/spnego/packet-spnego-template.c6
-rw-r--r--asn1/x411/x411-exp.cnf9
-rw-r--r--asn1/x411/x411.asn2
-rw-r--r--asn1/x411/x411.cnf6
-rw-r--r--asn1/x420/x420-exp.cnf9
-rw-r--r--asn1/x420/x420.asn2
-rw-r--r--asn1/x509af/x509af-exp.cnf9
-rw-r--r--asn1/x509ce/x509ce-exp.cnf9
-rw-r--r--asn1/x509if/x509if-exp.cnf9
-rw-r--r--asn1/x509sat/SelectedAttributeTypes.asn2
-rw-r--r--asn1/x509sat/x509sat-exp.cnf9
73 files changed, 378 insertions, 180 deletions
diff --git a/asn1/acse/acse-exp.cnf b/asn1/acse/acse-exp.cnf
index 7d309cbbc9..97f5c62841 100644
--- a/asn1/acse/acse-exp.cnf
+++ b/asn1/acse/acse-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\acse-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn
+
+#.MODULE
+ACSE-1 acse
+#.END
+
#.IMPORT_TAG
EXTERNAL BER_CLASS_UNI 8
AP-title BER_CLASS_ANY/*choice*/ -1/*choice*/
diff --git a/asn1/acse/acse.asn b/asn1/acse/acse.asn
index eea7559e94..8fc75e0f57 100644
--- a/asn1/acse/acse.asn
+++ b/asn1/acse/acse.asn
@@ -1,6 +1,6 @@
-- ACSE definition from
-- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x227bis/1998/ACSE-1.html
--- and modified to pass through ASN2ETH
+-- and modified to pass through asn2wrs
--
--
-- Module ACSE-1 (X.227bis:09/1998)
@@ -18,9 +18,9 @@ IMPORTS
-- ITU-T Rec. X.501 | ISO/IEC 9594-2.
--- Workaround for bug in ASN2ETH in the .cnf file
+-- Workaround for bug in asn2wrs in the .cnf file
-- to handle the lack of support for tagged assignments.
--- remove that workaround once asn2eth learns how to handle
+-- remove that workaround once asn2wrs learns how to handle
-- tagged assignments.
EXTERNAL ::= [UNIVERSAL 8] IMPLICIT SEQUENCE
{
@@ -45,30 +45,30 @@ aCSE-id OBJECT IDENTIFIER ::=
-- may be used to identify the Association Control ASE.
-- top level CHOICE
ACSE-apdu ::= CHOICE {
---ASN2ETH bug
+--asn2wrs bug
-- aarq AARQ-apdu,
aarq [APPLICATION 0] IMPLICIT AARQ-apdu,
---ASN2ETH bug
+--asn2wrs bug
-- aare AARE-apdu,
aare [APPLICATION 1] IMPLICIT AARE-apdu,
---ASN2ETH bug
+--asn2wrs bug
-- rlrq RLRQ-apdu,
rlrq [APPLICATION 2] IMPLICIT RLRQ-apdu,
---ASN2ETH bug
+--asn2wrs bug
-- rlre RLRE-apdu,
rlre [APPLICATION 3] IMPLICIT RLRE-apdu,
---ASN2ETH bug
+--asn2wrs bug
-- abrt ABRT-apdu,
abrt [APPLICATION 4] IMPLICIT ABRT-apdu,
...,
-- Extensions for higher level association FU
---ASN2ETH bug
+--asn2wrs bug
-- adt A-DT-apdu,
adt [APPLICATION 5] IMPLICIT A-DT-apdu,
---ASN2ETH bug
+--asn2wrs bug
-- acrq ACRQ-apdu,
acrq [APPLICATION 6] IMPLICIT ACRQ-apdu,
---ASN2ETH bug
+--asn2wrs bug
-- acrp ACRP-apdu
acrp [APPLICATION 7] IMPLICIT ACRP-apdu
}
@@ -301,14 +301,14 @@ Context-list ::=
SEQUENCE OF
SEQUENCE {pci Presentation-context-identifier,
abstract-syntax Abstract-syntax-name,
--- bug in ASN2ETH
+-- bug in asn2wrs
-- transfer-syntaxes SEQUENCE OF Transfer-syntax-name}
transfer-syntaxes SEQUENCE OF TransferSyntaxName}
Default-Context-List ::=
SEQUENCE OF
SEQUENCE {abstract-syntax-name [0] IMPLICIT Abstract-syntax-name OPTIONAL,
--- bug in ASN2ETH
+-- bug in asn2wrs
-- transfer-syntax-name [1] IMPLICIT Transfer-syntax-name
transfer-syntax-name [1] IMPLICIT TransferSyntaxName
}
@@ -328,11 +328,11 @@ P-context-result-list ::=
Result ::= INTEGER {acceptance(0), user-rejection(1), provider-rejection(2)}
---bug in ASN2ETH
+--bug in asn2wrs
--Concrete-syntax-name ::= Transfer-syntax-name
Concrete-syntax-name ::= TransferSyntaxName
---bug in ASN2ETH
+--bug in asn2wrs
--Transfer-syntax-name ::= OBJECT IDENTIFIER
TransferSyntaxName ::= OBJECT IDENTIFIER
@@ -374,7 +374,7 @@ User-Data ::= CHOICE {
-- see ITU-T Rec. X.226 | ISO/IEC 8823-1.
PDV-list ::= SEQUENCE {
---bug in ASN2ETH
+--bug in asn2wrs
-- transfer-syntax-name Transfer-syntax-name OPTIONAL,
transfer-syntax-name TransferSyntaxName OPTIONAL,
presentation-context-identifier Presentation-context-identifier,
diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf
index b22d1c6e6a..d841f4937b 100644
--- a/asn1/acse/acse.cnf
+++ b/asn1/acse/acse.cnf
@@ -47,7 +47,7 @@ ACRQ-apdu/aSO-context-name aCRQ_aSO_context_name
guint32 len1;
if(!implicit_tag) {
- /* XXX asn2eth can not yet handle tagged assignment so for the
+ /* XXX asn2wrs can not yet handle tagged assignment so for the
* time being just remove this tag manually inside the EXTERNAL
* dissector.
*/
diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c
index a341d33164..cea1aeb173 100644
--- a/asn1/acse/packet-acse-template.c
+++ b/asn1/acse/packet-acse-template.c
@@ -1,9 +1,9 @@
/*XXX
- There is a bug in asn2eth that it can not yet handle tagged assignments such
+ There is a bug in asn2wrs that it can not yet handle tagged assignments such
as EXTERNAL ::= [UNIVERSAL 8] IMPLICIT SEQUENCE {
This bug is workedaround by some .cnf magic but this should be cleaned up
- once asn2eth learns how to deal with tagged assignments
+ once asn2wrs learns how to deal with tagged assignments
*/
/* packet-acse.c
diff --git a/asn1/ansi_map/README b/asn1/ansi_map/README
index 6cfd443b3f..f127aa3618 100644
--- a/asn1/ansi_map/README
+++ b/asn1/ansi_map/README
@@ -1,6 +1,6 @@
-This is a work in progress to replace the existing ansi_map dissector with an asn2eth generated one.
+This is a work in progress to replace the existing ansi_map dissector with an asn2wrs generated one.
-To test/use this work in progress dissector you will have to compile it with asn2eth and copy the resulting .c and .h files over to epan/dissectors.
+To test/use this work in progress dissector you will have to compile it with asn2wrs and copy the resulting .c and .h files over to epan/dissectors.
This dissector is not yet ready for public consumption and lacks many vital features of the existing ansi_map dissector as it does not dissect
parameter data.
diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index c397c5f3a0..e18be789ce 100644
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -27,7 +27,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * Credit to Tomas Kukosa for developing the asn2eth compiler.
+ * Credit to Tomas Kukosa for developing the asn2wrs compiler.
*
* Title 3GPP2 Other
*
diff --git a/asn1/ansi_map/packet-ansi_map-template.h b/asn1/ansi_map/packet-ansi_map-template.h
index 53caf12a60..7b74e53ef5 100644
--- a/asn1/ansi_map/packet-ansi_map-template.h
+++ b/asn1/ansi_map/packet-ansi_map-template.h
@@ -37,7 +37,7 @@ typedef struct _ansi_map_tap_rec_t {
/*
* the following allows TAP code access to the messages
* without having to duplicate it. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
ETH_VAR_IMPORT const value_string ansi_map_opr_code_strings[];
diff --git a/asn1/cdt/cdt-exp.cnf b/asn1/cdt/cdt-exp.cnf
index 9f1111de9d..57d8607f11 100644
--- a/asn1/cdt/cdt-exp.cnf
+++ b/asn1/cdt/cdt-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\cdt-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn
+
+#.MODULE
+CompressedDataType cdt
+#.END
+
#.IMPORT_TAG
CompressedData BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
#.END
diff --git a/asn1/cmip/cmip-exp.cnf b/asn1/cmip/cmip-exp.cnf
index 1f4704aa1b..b804b825c9 100644
--- a/asn1/cmip/cmip-exp.cnf
+++ b/asn1/cmip/cmip-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\cmip-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn
+
+#.MODULE
+CMIP-A-ASSOCIATE-Information cmip
+#.END
+
#.IMPORT_TAG
RDNSequence BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
ObjectClass BER_CLASS_ANY/*choice*/ -1/*choice*/
diff --git a/asn1/cms/CryptographicMessageSyntax.asn b/asn1/cms/CryptographicMessageSyntax.asn
index 02fbf9759e..9159116e67 100644
--- a/asn1/cms/CryptographicMessageSyntax.asn
+++ b/asn1/cms/CryptographicMessageSyntax.asn
@@ -1,5 +1,5 @@
-- Extracted from RFC2630
--- and massaged/modified so it passws through our ASN2ETH compiler
+-- and massaged/modified so it passws through our asn2wrs compiler
CryptographicMessageSyntax { iso(1) member-body(2) us(840) rsadsi(113549)
pkcs(1) pkcs-9(9) smime(16) modules(0) cms(1) } DEFINITIONS IMPLICIT TAGS ::=
diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf
index a721605a36..03c3c94086 100644
--- a/asn1/cms/cms-exp.cnf
+++ b/asn1/cms/cms-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\cms-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn
+
+#.MODULE
+CryptographicMessageSyntax cms
+#.END
+
#.IMPORT_TAG
ContentInfo BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
ContentType BER_CLASS_UNI BER_UNI_TAG_OID
diff --git a/asn1/cms/packet-cms-template.c b/asn1/cms/packet-cms-template.c
index 5fcde83df6..a2c381b7a2 100644
--- a/asn1/cms/packet-cms-template.c
+++ b/asn1/cms/packet-cms-template.c
@@ -54,7 +54,7 @@ static int hf_cms_ci_contentType = -1;
/* Initialize the subtree pointers */
#include "packet-cms-ett.c"
-static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2eth stops generating these silly wrappers */
+static int dissect_cms_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) ; /* XXX kill a compiler warning until asn2wrs stops generating these silly wrappers */
static const char *object_identifier_id;
diff --git a/asn1/dap/dap-exp.cnf b/asn1/dap/dap-exp.cnf
index 185cd1f698..f767e3351a 100644
--- a/asn1/dap/dap-exp.cnf
+++ b/asn1/dap/dap-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\dap-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn
+
+#.MODULE
+DirectoryAbstractService dap
+#.END
+
#.IMPORT_TAG
CommonResults BER_CLASS_UNI BER_UNI_TAG_SET
ContextSelection BER_CLASS_ANY/*choice*/ -1/*choice*/
diff --git a/asn1/disp/disp-exp.cnf b/asn1/disp/disp-exp.cnf
index 25672f3ac4..c92d1d271f 100644
--- a/asn1/disp/disp-exp.cnf
+++ b/asn1/disp/disp-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\disp-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn
+
+#.MODULE
+DirectoryShadowAbstractService disp
+#.END
+
#.IMPORT_TAG
AgreementID BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
#.END
diff --git a/asn1/dop/dop-exp.cnf b/asn1/dop/dop-exp.cnf
index 645660e586..1d6a8d3567 100644
--- a/asn1/dop/dop-exp.cnf
+++ b/asn1/dop/dop-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\dop-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn
+
+#.MODULE
+DSAOperationalAttributeTypes dop
+#.END
+
#.IMPORT_TAG
DSEType BER_CLASS_UNI BER_UNI_TAG_BITSTRING
SupplierAndConsumers BER_CLASS_UNI BER_UNI_TAG_SET
diff --git a/asn1/dsp/dsp-exp.cnf b/asn1/dsp/dsp-exp.cnf
index ac4b9145e9..c9b30f6283 100644
--- a/asn1/dsp/dsp-exp.cnf
+++ b/asn1/dsp/dsp-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\dsp-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn
+
+#.MODULE
+DistributedOperations dsp
+#.END
+
#.IMPORT_TAG
OperationProgress BER_CLASS_UNI BER_UNI_TAG_SET
ReferenceType BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
diff --git a/asn1/ess/ExtendedSecurityServices.asn b/asn1/ess/ExtendedSecurityServices.asn
index 0e6a993237..9c686c16f6 100644
--- a/asn1/ess/ExtendedSecurityServices.asn
+++ b/asn1/ess/ExtendedSecurityServices.asn
@@ -1,6 +1,6 @@
-- ExtendedSecurityServices as defined in RFC2634
--
--- The ASN definition has been modified to suit the Wireshark ASN2ETH compiler
+-- The ASN definition has been modified to suit the Wireshark asn2wrs compiler
--
--
--
diff --git a/asn1/ftam/ISO8571-FTAM.asn b/asn1/ftam/ISO8571-FTAM.asn
index 8037341559..c57625814d 100644
--- a/asn1/ftam/ISO8571-FTAM.asn
+++ b/asn1/ftam/ISO8571-FTAM.asn
@@ -71,14 +71,14 @@ F-INITIALIZE-response ::= SEQUENCE {
-- If the recovery or restart data transfer functional units are
-- not available, the Checkpoint-window Parameter shall not be sent.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Protocol-Version ::= [0] IMPLICIT BIT STRING {version-1(0), version-2(1)
}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Implementation-Information ::= [1] IMPLICIT GraphicString
@@ -87,7 +87,7 @@ Implementation-Information ::= [1] IMPLICIT GraphicString
-- needing to distinguish between implernentations of a specific version number
-- of different equipment, it shall not be the subject of conformance test.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Service-Class ::= [3] IMPLICIT BIT STRING {
@@ -95,7 +95,7 @@ Service-Class ::= [3] IMPLICIT BIT STRING {
transfer-and-management-class(3), access-class(4)}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Functional-Units ::= [4] IMPLICIT BIT STRING {
@@ -108,7 +108,7 @@ Functional-Units ::= [4] IMPLICIT BIT STRING {
-- Values 2 to 14 are Chosen to align with numbering scheme used in ISO 8571-3.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Attribute-Groups ::= [5] IMPLICIT BIT STRING {
@@ -117,7 +117,7 @@ Attribute-Groups ::= [5] IMPLICIT BIT STRING {
-- The extension bit is defined if and only if the limited-filestore-management
-- or the group-manipulation functional units are available.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
FTAM-Quality-of-Service ::= [6] IMPLICIT INTEGER {
@@ -125,7 +125,7 @@ FTAM-Quality-of-Service ::= [6] IMPLICIT INTEGER {
}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Contents-Type-List ::=
@@ -531,26 +531,26 @@ F-RESTART-response ::= SEQUENCE {
}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Degree-Of-Overlap ::= [APPLICATION 30] IMPLICIT INTEGER {
normal(0), consecutive(1), concurrent(2)}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Request-Type ::= [APPLICATION 31] IMPLICIT INTEGER {read(0), write(1)}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Abstract-Syntax-Name ::= [APPLICATION 0] IMPLICIT OBJECT IDENTIFIER
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Access-Context ::= [APPLICATION 1] IMPLICIT SEQUENCE {
@@ -569,7 +569,7 @@ Access-Context ::= [APPLICATION 1] IMPLICIT SEQUENCE {
-- (access context FL) is selected.
-- As defined in ISO 8571-2.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Access-Passwords ::= [APPLICATION 2] IMPLICIT SEQUENCE {
@@ -590,7 +590,7 @@ Access-Passwords ::= [APPLICATION 2] IMPLICIT SEQUENCE {
-- or the Object-manipulation or the group-manipulation functional
-- units are available.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Access-Request ::= [APPLICATION 3] IMPLICIT BIT STRING {
@@ -598,20 +598,20 @@ Access-Request ::= [APPLICATION 3] IMPLICIT BIT STRING {
change-attribute(6), delete-Object(7)}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Account ::= [APPLICATION 4] IMPLICIT GraphicString
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Action-Result ::= [APPLICATION 5] IMPLICIT INTEGER {
success(0), transient-error(1), permanent-error(2)}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Activity-Identifier ::= [APPLICATION 6] IMPLICIT INTEGER
@@ -620,7 +620,7 @@ Application-Entity-Title ::= [APPLICATION 7] AE-title
-- As defined in ISO 8650.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Change-Attributes ::= [APPLICATION 8] IMPLICIT SEQUENCE {
@@ -647,7 +647,7 @@ Change-Attributes ::= [APPLICATION 8] IMPLICIT SEQUENCE {
-- Atleast one attribute shall be present in the Change-Attributes
-- Parameter on the request PDU.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Charging ::=
@@ -658,7 +658,7 @@ Charging ::=
charging-value [2] IMPLICIT INTEGER}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Concurrency-Control ::= [APPLICATION 10] IMPLICIT SEQUENCE {
@@ -675,13 +675,13 @@ Concurrency-Control ::= [APPLICATION 10] IMPLICIT SEQUENCE {
Lock ::= INTEGER {not-required(0), shared(1), exclusive(2), no-access(3)}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Constraint-Set-Name ::= [APPLICATION 11] IMPLICIT OBJECT IDENTIFIER
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Create-Attributes ::= [APPLICATION 12] IMPLICIT SEQUENCE {
@@ -711,7 +711,7 @@ Create-Attributes ::= [APPLICATION 12] IMPLICIT SEQUENCE {
-- This Parameter tan only be sent when the
-- limited-filestore-management functional unit is available.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Diagnostic ::=
@@ -739,7 +739,7 @@ Entity-Reference ::= INTEGER {
-- 1. The values 0 and 3 are only valid as values in error-source.
-- 2. The value 5 corresponds to the virtual filestore.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
-- Document-Type-Name ::= [APPLICATION 14] IMPLICIT OBJECT IDENTIFIER
@@ -747,7 +747,7 @@ Entity-Reference ::= INTEGER {
Document-Type-Name ::= OBJECT IDENTIFIER
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
FADU-Identity ::= [APPLICATION 15] CHOICE {
@@ -764,13 +764,13 @@ Node-Name ::= EXTERNAL
-- The type to be used for Node-Name is defined in IS08571-FADU.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
FADU-Lock ::= [APPLICATION 16] IMPLICIT INTEGER {off(0), on(1)}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Password ::= [APPLICATION 17] CHOICE {
@@ -779,7 +779,7 @@ Password ::= [APPLICATION 17] CHOICE {
}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Read-Attributes ::= [APPLICATION 18] IMPLICIT SEQUENCE {
@@ -847,7 +847,7 @@ Read-Attributes ::= [APPLICATION 18] IMPLICIT SEQUENCE {
-- This Parameter tan be sent if and only if
-- the limited-filestore-management functional unit is available.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Select-Attributes ::= [APPLICATION 19] IMPLICIT SEQUENCE {
@@ -858,14 +858,14 @@ Select-Attributes ::= [APPLICATION 19] IMPLICIT SEQUENCE {
-- This field may be used to convey commitment control as described
-- in ISO 8571-3.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
State-Result ::= [APPLICATION 21] IMPLICIT INTEGER {success(0), failure(1)
}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
User-Identity ::= [APPLICATION 22] IMPLICIT GraphicString
@@ -1306,7 +1306,7 @@ Extension-Set-Identifier ::= OBJECT IDENTIFIER
Extension-Attribute-identifier ::= OBJECT IDENTIFIER
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Scope ::=
@@ -1482,7 +1482,7 @@ Attribute-Extensions-Pattern ::=
Destination-File-Directory ::= [APPLICATION 24] Pathname-Attribute
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Objects-Attributes-List ::=
@@ -1496,7 +1496,7 @@ Override ::= INTEGER {
Error-Action ::= INTEGER {terminate(0), continue(1)}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Operation-Result ::= [APPLICATION 30] CHOICE {
@@ -1512,7 +1512,7 @@ Pass-Passwords ::= SEQUENCE OF Password
-- Pass-Passwords and the non-terminal elements of the specified
-- Pathname.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Path-Access-Passwords ::=
@@ -1533,7 +1533,7 @@ Path-Access-Passwords ::=
-- Path-Access-Passwords and the non-terminal elements sf the
-- specified Pathname.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Request-Operation-Result ::= [APPLICATION 31] IMPLICIT INTEGER {
@@ -1564,7 +1564,7 @@ Attribute-Names ::= BIT STRING -- Kernel group
-- Bits 19 through 23 arc defined if and only if the limited-fil8Store-manag8m8nt
-- or group-manipulation functionat units are available.
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Referent-Indicator ::= [APPLICATION 29] IMPLICIT BOOLEAN
@@ -1591,13 +1591,13 @@ AE-title ::= SEQUENCE {ap AP-title,
}
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Shared-ASE-Information ::= [APPLICATION 20] IMPLICIT EXTERNAL
--
--- XXX Bug in asn2eth that can not handle tagged assignements
+-- XXX Bug in asn2wrs that can not handle tagged assignements
-- XXX woraround implemented in teh conformance file
--
Attribute-Value-Assertions ::= [APPLICATION 26] IMPLICIT SEQUENCE OF AND-Set
diff --git a/asn1/ftam/ftam-exp.cnf b/asn1/ftam/ftam-exp.cnf
index f4d6d04927..bcf2635805 100644
--- a/asn1/ftam/ftam-exp.cnf
+++ b/asn1/ftam/ftam-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\ftam-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn
+
+#.MODULE
+ISO8571-FTAM ftam
+#.END
+
#.IMPORT_TAG
Concurrency-Access BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
Date-and-Time-Attribute BER_CLASS_ANY/*choice*/ -1/*choice*/
diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf
index 5f4e6f8832..805d4329f3 100644
--- a/asn1/ftam/ftam.cnf
+++ b/asn1/ftam/ftam.cnf
@@ -94,7 +94,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -111,7 +111,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -128,7 +128,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -145,7 +145,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -163,7 +163,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -181,7 +181,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -197,7 +197,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -214,7 +214,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -230,7 +230,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -246,7 +246,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -263,7 +263,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -279,7 +279,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -295,7 +295,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -311,7 +311,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -327,7 +327,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -344,7 +344,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -360,7 +360,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -377,7 +377,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -394,7 +394,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -411,7 +411,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -427,7 +427,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -443,7 +443,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -462,7 +462,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -478,7 +478,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -494,7 +494,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -510,7 +510,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -526,7 +526,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -542,7 +542,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -558,7 +558,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -575,7 +575,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -591,7 +591,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -607,7 +607,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -622,7 +622,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -637,7 +637,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -652,7 +652,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -669,7 +669,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -685,7 +685,7 @@ Legal-Qualification-Attribute/actual-values actual_values9
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
diff --git a/asn1/gsmmap/GSMMAP.asn b/asn1/gsmmap/GSMMAP.asn
index 80706df41a..7878fae39a 100644
--- a/asn1/gsmmap/GSMMAP.asn
+++ b/asn1/gsmmap/GSMMAP.asn
@@ -342,7 +342,7 @@ ADD-Info ::= SEQUENCE {
...}
--- Ethereal adaptation
+-- Wireshark adaptation
PrivateExtensionList ::= SEQUENCE OF PrivateExtension
PrivateExtension ::= SEQUENCE {
@@ -365,7 +365,7 @@ SLR-Arg-PCS-Extensions ::= SEQUENCE {
Teleservice ::= OCTET STRING ( SIZE( 1 .. 5 ) )
Bearerservice ::= OCTET STRING ( SIZE( 1 .. 5 ) )
Msc-Number ::= OCTET STRING ( SIZE( 1 .. 20 ) ) ( SIZE( 1 .. 9 ) )
--- End Ethereal adaptation
+-- End Wireshark adaptation
--cancelLocation OPERATION
@@ -652,7 +652,7 @@ ProtocolId ::= ENUMERATED {
Sgsn-Number ::= OCTET STRING ( SIZE( 1 .. 20 ) ) ( SIZE( 1 .. 9 ) )
Vlr-Number ::= OCTET STRING ( SIZE( 1 .. 20 ) ) ( SIZE( 1 .. 9 ) )
--- End Ethereal adaptation --
+-- End Wireshark adaptation --
--sendEndSignal OPERATION
-- ARGUMENT
--Bss-APDU ::= SEQUENCE { ... defined elsewhere
@@ -1515,7 +1515,7 @@ MG-CSI ::= SEQUENCE {
--- Ethereal adaptation --
+-- Wireshark adaptation --
Category ::= OCTET STRING (SIZE (1))
-- The internal structure is defined in ITU-T Rec Q.763.
diff --git a/asn1/gsmmap/gsm_map-exp.cnf b/asn1/gsmmap/gsm_map-exp.cnf
index d3748efff5..c0a61e1d29 100644
--- a/asn1/gsmmap/gsm_map-exp.cnf
+++ b/asn1/gsmmap/gsm_map-exp.cnf
@@ -1,7 +1,7 @@
# Do not modify this file.
-# It is created automatically by the ASN.1 to Ethereal dissector compiler
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
# .\gsm_map-exp.cnf
-# ../../tools/asn2eth.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn
+# ../../tools/asn2wrs.py -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn
#.MODULE
MAP-Protocol gsm_map
diff --git a/asn1/gsmmap/packet-gsm_map-template.c b/asn1/gsmmap/packet-gsm_map-template.c
index 143fcdadf5..6f62cd1d24 100644
--- a/asn1/gsmmap/packet-gsm_map-template.c
+++ b/asn1/gsmmap/packet-gsm_map-template.c
@@ -738,7 +738,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
case 3: /*cancelLocation*/
octet = tvb_get_guint8(tvb,0) & 0xf;
if ( octet == 3){ /* */
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag);
@@ -810,7 +810,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
case 29: /*sendEndSignal*/
octet = tvb_get_guint8(tvb,0) & 0xf;
if ( octet == 3){ /* This is a V3 message ??? */
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag);
@@ -829,7 +829,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
case 33: /*processAccessSignalling*/
octet = tvb_get_guint8(tvb,0) & 0xf;
if ( octet == 3){ /* This is a V3 message ??? */
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag);
@@ -842,7 +842,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
case 34: /*forwardAccessSignalling*/
octet = tvb_get_guint8(tvb,0) & 0xf;
if ( octet == 3){ /* This is a V3 message ??? */
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag);
@@ -933,7 +933,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
offset=dissect_gsm_map_ReadyForSM_Arg(FALSE, tvb, offset, pinfo, tree, -1);
break;
case 67: /*purgeMS*/
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag);
@@ -943,7 +943,7 @@ static int dissect_invokeData(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
case 68: /*prepareHandover*/
octet = tvb_get_guint8(tvb,0) & 0xf;
if ( octet == 3){ /* This is a V3 message ??? */
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag);
@@ -1143,7 +1143,7 @@ static int dissect_returnResultData(packet_info *pinfo, proto_tree *tree, tvbuff
*/
octet = tvb_get_guint8(tvb,0) & 0xf;
if ( octet == 3){ /* This is a V3 message ??? */
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag);
@@ -1154,7 +1154,7 @@ static int dissect_returnResultData(packet_info *pinfo, proto_tree *tree, tvbuff
case 56: /*sendAuthenticationInfo*/
octet = tvb_get_guint8(tvb,0) & 0xf;
if ( octet == 3){ /* This is a V3 message ??? */
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag);
@@ -1196,7 +1196,7 @@ static int dissect_returnResultData(packet_info *pinfo, proto_tree *tree, tvbuff
case 68: /*prepareHandover*/
octet = tvb_get_guint8(tvb,0) & 0xf;
if ( octet == 3){ /* This is a V3 message ??? */
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &bug_class, &bug_pc, &bug_tag);
diff --git a/asn1/h225/h225.asn b/asn1/h225/h225.asn
index bd94d76805..e13508ca1c 100644
--- a/asn1/h225/h225.asn
+++ b/asn1/h225/h225.asn
@@ -412,7 +412,7 @@ TransportAddress ::= CHOICE {
nonStandardAddress NonStandardParameter,
...
}
--- Ethereal adaptation
+-- Wireshark adaptation
H245TransportAddress ::= CHOICE {
h245ipAddress
SEQUENCE {h245ipv4 OCTET STRING(SIZE (4)),
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c
index edf47f6b81..a3394f1622 100644
--- a/asn1/h225/packet-h225-template.c
+++ b/asn1/h225/packet-h225-template.c
@@ -28,7 +28,7 @@
* to hack it by hand, but it is incomplete and buggy and it is good when
* it will go away."
* Ronnie did a great job and all the VoIP users had made good use of it!
- * Credit to Tomas Kukosa for developing the Asn2eth compiler.
+ * Credit to Tomas Kukosa for developing the asn2wrs compiler.
*
*/
diff --git a/asn1/h225/packet-h225-template.h b/asn1/h225/packet-h225-template.h
index 6b70f70cb4..e41d69fd84 100644
--- a/asn1/h225/packet-h225-template.h
+++ b/asn1/h225/packet-h225-template.h
@@ -73,7 +73,7 @@ typedef struct _h225_packet_info {
/*
* the following allows TAP code access to the messages
* without having to duplicate it. With MSVC and a
- * libethereal.dll, we need a special declaration.
+ * libwireshark.dll, we need a special declaration.
*/
#include "packet-per.h"
diff --git a/asn1/h235/H235-SECURITY-MESSAGES.asn b/asn1/h235/H235-SECURITY-MESSAGES.asn
index a6655ddae4..701da9c9cc 100644
--- a/asn1/h235/H235-SECURITY-MESSAGES.asn
+++ b/asn1/h235/H235-SECURITY-MESSAGES.asn
@@ -2,7 +2,7 @@
-- Taken from ITU ASN.1 database
-- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h235.0/2005/H235-SECURITY-MESSAGES.asn
--
--- Features unbacked with ASN.1 to Ethereal compiler was commented out
+-- Features unbacked with ASN.1 to Wireshark compiler was commented out
--
-- Module H235-SECURITY-MESSAGES (H.235.0:09/2005)
diff --git a/asn1/h235/H235-SRTP.asn b/asn1/h235/H235-SRTP.asn
index 151c4e8c98..4b15113d78 100644
--- a/asn1/h235/H235-SRTP.asn
+++ b/asn1/h235/H235-SRTP.asn
@@ -2,7 +2,7 @@
-- Taken from ITU ASN.1 database
-- http://www.itu.int/ITU-T/asn1/database/itu-t/h/h235.8/2005/H235-SRTP.asn
--
--- Features unbacked with ASN.1 to Ethereal compiler was commented out
+-- Features unbacked with ASN.1 to Wireshark compiler was commented out
--
-- Module H235-SRTP (H.235.8:09/2005)
diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c
index 35185cc175..a91625a033 100644
--- a/asn1/h245/packet-h245-template.c
+++ b/asn1/h245/packet-h245-template.c
@@ -28,7 +28,7 @@
* to hack it by hand, but it is incomplete and buggy and it is good when
* it will go away."
* Ronnie did a great job and all the VoIP users had made good use of it!
- * Credit to Tomas Kukosa for developing the Asn2eth compiler.
+ * Credit to Tomas Kukosa for developing the asn2wrs compiler.
*
*/
diff --git a/asn1/h248/MEGACO.asn b/asn1/h248/MEGACO.asn
index ce765dbff5..89ecd585ab 100644
--- a/asn1/h248/MEGACO.asn
+++ b/asn1/h248/MEGACO.asn
@@ -1,7 +1,7 @@
-- This ASN definition is taken from
-- http://132.151.1.19/internet-drafts/draft-ietf-megaco-h248v2-04.txt
--
--- and has been modified to pass through the ASN2ETH compiler
+-- and has been modified to pass through the asn2wrs compiler
-- (we dont support automatic tags yet so the tags had to be added by
-- hand)
diff --git a/asn1/h450/h4501.asn b/asn1/h450/h4501.asn
index 2efb6a05a2..4b9491f69a 100644
--- a/asn1/h450/h4501.asn
+++ b/asn1/h450/h4501.asn
@@ -173,7 +173,7 @@ PresentationAllowedIndicator ::= BOOLEAN
-- Module Call-Transfer-Operations (H.450.2:02/1998)
-- Call-Transfer-Operations {itu-t recommendation h 450 2 version1(0)
-- call-transfer-operations(0)} DEFINITIONS AUTOMATIC TAGS ::=
--- Edited for ethereal purposes
+-- Edited for Wireshark purposes
CallTransferIdentify ::= DummyArg
CallTransferAbandon ::= DummyArg
@@ -557,7 +557,7 @@ SubscriptionOption ::= ENUMERATED {
-- nonStandard NonStandardParameter}
-- CODE local:1008
-- }
--- BasicService defined for MWI should do for ethereal purposes
+-- BasicService defined for MWI should do for Wireshark purposes
-- BasicService ::= ENUMERATED {
-- allServices(0),
-- speech (1),
@@ -573,7 +573,7 @@ SubscriptionOption ::= ENUMERATED {
-- For multimedia calls the value "allServices" shall be used only.
-- The usage of the other codepoints for multimedia calls is for further study.
--- Defined elsewhere for ethereal
+-- Defined elsewhere for Wireshark
-- ExtensionSeq ::= SEQUENCE OF Extension
--
-- ExtensionSet EXTENSION ::=
@@ -1695,7 +1695,7 @@ CIStatusInformation ::= CHOICE {
-- H323CommonInformationOperations OPERATION ::= {cmnRequest | cmnInform}
-- cmnRequest OPERATION ::= {
--- ARGUMENT DummyArg used as CmnRequestArg ( Ethereal )
+-- ARGUMENT DummyArg used as CmnRequestArg ( Wireshark )
-- OPTIONAL TRUE
-- RESULT CmnArg
-- ERRORS {undefined}
@@ -1878,7 +1878,7 @@ H225InformationElement ::= OCTET STRING
-- extensionId EXTENSION.&extensionId({ExtensionSet}),
-- extensionArgument EXTENSION.&ArgumentType({ExtensionSet}{@extensionId})
--}
--- Ethereal adaptation NEEDS VERIFICATION !
+-- Wireshark adaptation NEEDS VERIFICATION !
Extension ::= SEQUENCE {
extensionId OBJECT IDENTIFIER,
extensionArgument ExtensionArgument
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index c8c1936718..8f83785427 100644
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.c
@@ -24,7 +24,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
- * Credit to Tomas Kukosa for developing the Asn2eth compiler.
+ * Credit to Tomas Kukosa for developing the asn2wrs compiler.
*
*/
diff --git a/asn1/ldap/README b/asn1/ldap/README
index f8acf6032f..d43b67c552 100644
--- a/asn1/ldap/README
+++ b/asn1/ldap/README
@@ -1,6 +1,6 @@
-This is a work in progress to enhance and replace the existing ldap dissector with an asn2eth generated one.
+This is a work in progress to enhance and replace the existing ldap dissector with an asn2wrs generated one.
-To test/use this work in progress dissector you will have to compile it with asn2eth and copy the resulting .c and .h files over to epan/dissectors.
+To test/use this work in progress dissector you will have to compile it with asn2wrs and copy the resulting .c and .h files over to epan/dissectors.
This dissector is not yet ready for public consumption and lacks many vital features of the existing ldap dissector such as CLDAP support.
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf
index 0327dcc17f..8fd03a44f0 100644
--- a/asn1/ldap/ldap.cnf
+++ b/asn1/ldap/ldap.cnf
@@ -418,7 +418,7 @@ ldap_conv_info_t *ldap_info;
#.FN_BODY UnbindRequest
- implicit_tag = TRUE; /* correct problem with asn2eth */
+ implicit_tag = TRUE; /* correct problem with asn2wrs */
%(DEFAULT_BODY)s
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index ebccb55818..9df5055fb6 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -63,7 +63,7 @@
*
* Stefan Metzmacher <metze@samba.org>
*
- * 15-NOV-2005 - Changed to use the asn2eth compiler
+ * 15-NOV-2005 - Changed to use the asn2wrs compiler
* Anders Broman <anders.broman@ericsson.com>
*/
@@ -1170,12 +1170,12 @@ void proto_register_ldap(void) {
{ &hf_mscldap_netlogon_type,
{ "Type", "mscldap.netlogon.type",
FT_UINT32, BASE_DEC, NULL, 0x0,
- "Type of <please tell ethereal developers what this type is>", HFILL }},
+ "Type of <please tell Wireshark developers what this type is>", HFILL }},
{ &hf_mscldap_netlogon_version,
{ "Version", "mscldap.netlogon.version",
FT_UINT32, BASE_DEC, NULL, 0x0,
- "Version of <please tell ethereal developers what this type is>", HFILL }},
+ "Version of <please tell Wireshark developers what this type is>", HFILL }},
{ &hf_mscldap_netlogon_lm_token,
{ "LM Token", "mscldap.netlogon.lm_token",
diff --git a/asn1/logotype-cert-extn/LogotypeCertExtn.asn b/asn1/logotype-cert-extn/LogotypeCertExtn.asn
index c55b0ed9bb..3bf7eeef1f 100644
--- a/asn1/logotype-cert-extn/LogotypeCertExtn.asn
+++ b/asn1/logotype-cert-extn/LogotypeCertExtn.asn
@@ -1,5 +1,5 @@
--- This ASN.1 module was taken from RFC3709 and modified to fit through Ethereals
--- ANS2ETH compiler
+-- This ASN.1 module was taken from RFC3709 and modified to fit through Wiresharks
+-- ANS2WRS compiler
--
-- The copyright statement of the RFC as follows :
--
diff --git a/asn1/mms/mms-exp.cnf b/asn1/mms/mms-exp.cnf
index 6d1be09b4e..9dc0cf51d2 100644
--- a/asn1/mms/mms-exp.cnf
+++ b/asn1/mms/mms-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\mms-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p mms -c mms.cnf -s packet-mms-template mms.asn
+
+#.MODULE
+MMS mms
+#.END
+
#.IMPORT_TAG
MMSpdu BER_CLASS_ANY/*choice*/ -1/*choice*/
#.END
diff --git a/asn1/mms/mms.asn b/asn1/mms/mms.asn
index d6ba3a3402..05ecd010e7 100644
--- a/asn1/mms/mms.asn
+++ b/asn1/mms/mms.asn
@@ -6,7 +6,7 @@
--Corrections made July 2, 1994
--
--
--- Modified to pass ASN2ETH
+-- Modified to pass asn2wrs
MMS { iso standard 9506 part(2) mms-general-module-version(2) }
@@ -1391,7 +1391,7 @@ Data ::= CHOICE
integer [5] IMPLICIT INTEGER,
unsigned [6] IMPLICIT INTEGER,
floating-point [7] IMPLICIT FloatingPoint,
--- XXX asn2eth and packet-ber can not handle REAL yet
+-- XXX asn2wrs and packet-ber can not handle REAL yet
-- real [8] IMPLICIT REAL,
octet-string [9] IMPLICIT OCTET STRING,
visible-string [10] IMPLICIT VisibleString,
diff --git a/asn1/ocsp/OCSP.asn b/asn1/ocsp/OCSP.asn
index 21f4945eaa..9d699d9022 100644
--- a/asn1/ocsp/OCSP.asn
+++ b/asn1/ocsp/OCSP.asn
@@ -1,7 +1,7 @@
-- Online Certificate Status Protocol
-- RFC 2560
-- This definition was taken from RFC2560 and modified to pass through
--- ASN2ETH.
+-- asn2wrs.
-- The original copyright from RFC2650 follows below
--
-- Full Copyright Statement
diff --git a/asn1/pkinit/PKINIT.asn b/asn1/pkinit/PKINIT.asn
index 2a1549d304..b8fed67b45 100644
--- a/asn1/pkinit/PKINIT.asn
+++ b/asn1/pkinit/PKINIT.asn
@@ -2,7 +2,7 @@
--packetcable as well as new users once the protocol is standardized.
--
--This asn1 file is based on draft-ietf-cat-kerberos-pk-init-20.txt
---but has been modified to acocmodate the ethereal asn2eth compiler
+--but has been modified to acocmodate the Wireshark asn2wrs compiler
--and our environment
--
--new structures are uncommented and added on demand as they are required
@@ -25,7 +25,7 @@ KerberosV5-PK-INIT-SPEC {
iso(1) identified-organization(3) dod(6) internet(1)
security(5) kerberosV5(2) modules(4) pkinit(0) }
-- security(5) kerberosV5(2) modules(4) pkinit(TBD) }
--- TBD makes the asn2eth compiler upset
+-- TBD makes the asn2wrs compiler upset
DEFINITIONS EXPLICIT TAGS ::=
BEGIN
diff --git a/asn1/pkix1explicit/PKIX1EXPLICIT93.asn b/asn1/pkix1explicit/PKIX1EXPLICIT93.asn
index b2adfebb6a..86a52ac153 100644
--- a/asn1/pkix1explicit/PKIX1EXPLICIT93.asn
+++ b/asn1/pkix1explicit/PKIX1EXPLICIT93.asn
@@ -33,7 +33,7 @@
--
--NOTE: This ASN1 definition have been significantly modified from the original
--version in RFC2459 in order to accomodate the featuresets available
---in the ethereal projects asn2eth compiler.
+--in the Wireshark projects asn2wrs compiler.
--It has also been modified and structures have been commented out that
--are already implemented in the X509 dissectors.
--Dissectors present already in the X509 dissectors should be implemented in
diff --git a/asn1/pkix1explicit/packet-pkix1explicit-template.c b/asn1/pkix1explicit/packet-pkix1explicit-template.c
index e874aa77c2..1e25b07105 100644
--- a/asn1/pkix1explicit/packet-pkix1explicit-template.c
+++ b/asn1/pkix1explicit/packet-pkix1explicit-template.c
@@ -1,4 +1,4 @@
-#define BER_UNI_TAG_TeletexString 20 /* workaround bug in asn2eth */
+#define BER_UNI_TAG_TeletexString 20 /* workaround bug in asn2wrs */
/* packet-pkix1explicit.c
* Routines for PKIX1Explitic packet dissection
diff --git a/asn1/pkix1explicit/pkix1explicit-exp.cnf b/asn1/pkix1explicit/pkix1explicit-exp.cnf
index 28cf64cad4..644164ac12 100644
--- a/asn1/pkix1explicit/pkix1explicit-exp.cnf
+++ b/asn1/pkix1explicit/pkix1explicit-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\pkix1explicit-exp.cnf
+# ../../tools/asn2wrs.py -e -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn
+
+#.MODULE
+PKIX1Explicit93 pkix1explicit
+#.END
+
#.IMPORT_TAG
CertificateSerialNumber BER_CLASS_UNI BER_UNI_TAG_INTEGER
Extensions BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/pkix1implicit/PKIX1IMPLICIT93.asn b/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
index ded089d4c2..487bf84f62 100644
--- a/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
+++ b/asn1/pkix1implicit/PKIX1IMPLICIT93.asn
@@ -33,7 +33,7 @@
--
--NOTE: This ASN1 definition have been significantly modified from the original
--version in RFC2459 in order to accomodate the featuresets available
---in the ethereal projects asn2eth compiler.
+--in the Wireshark projects asn2wrs compiler.
--It has also been modified and structures have been commented out that
--are already implemented in the X509 dissectors.
--Dissectors present already in the X509 dissectors should be implemented in
diff --git a/asn1/pkix1implicit/pkix1implicit-exp.cnf b/asn1/pkix1implicit/pkix1implicit-exp.cnf
index 7c6f72cebc..42a81a46e0 100644
--- a/asn1/pkix1implicit/pkix1implicit-exp.cnf
+++ b/asn1/pkix1implicit/pkix1implicit-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\pkix1implicit-exp.cnf
+# ../../tools/asn2wrs.py -e -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn
+
+#.MODULE
+PKIX1Implicit93 pkix1implicit
+#.END
+
#.IMPORT_TAG
AuthorityInfoAccessSyntax BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
UserNotice BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/pkixcmp/CMP.asn b/asn1/pkixcmp/CMP.asn
index 505e1fd439..17ba4f7c88 100644
--- a/asn1/pkixcmp/CMP.asn
+++ b/asn1/pkixcmp/CMP.asn
@@ -1,5 +1,5 @@
-- This ASN.1 definition is taken from RFC2510 and modified to pass
--- through the ASN2ETH compiler.
+-- through the asn2wrs compiler.
--
-- The original copyright statement from RFC2510 follows below:
--
diff --git a/asn1/pkixcmp/cmp-exp.cnf b/asn1/pkixcmp/cmp-exp.cnf
index 56e13e661f..7b448b761c 100644
--- a/asn1/pkixcmp/cmp-exp.cnf
+++ b/asn1/pkixcmp/cmp-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\cmp-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn
+
+#.MODULE
+CMP cmp
+#.END
+
#.IMPORT_TAG
PKIMessage BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
PKIHeader BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/pkixcrmf/CRMF.asn b/asn1/pkixcrmf/CRMF.asn
index 2622442ca5..55ce3a42b4 100644
--- a/asn1/pkixcrmf/CRMF.asn
+++ b/asn1/pkixcrmf/CRMF.asn
@@ -1,5 +1,5 @@
-- This ASN1 definition is taken from RFC2511 and modified to pass through
--- the ASN2ETH compiler.
+-- the asn2wrs compiler.
--
-- The copyright statement from the original description in RFC2511
-- follows below:
diff --git a/asn1/pkixcrmf/crmf-exp.cnf b/asn1/pkixcrmf/crmf-exp.cnf
index 9cbf380221..02a06d1226 100644
--- a/asn1/pkixcrmf/crmf-exp.cnf
+++ b/asn1/pkixcrmf/crmf-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\crmf-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn
+
+#.MODULE
+CRMF crmf
+#.END
+
#.IMPORT_TAG
CertReqMessages BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
CertReqMsg BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/pkixproxy/PKIXProxy.asn b/asn1/pkixproxy/PKIXProxy.asn
index 415ca89036..c4f2956aaa 100644
--- a/asn1/pkixproxy/PKIXProxy.asn
+++ b/asn1/pkixproxy/PKIXProxy.asn
@@ -1,6 +1,6 @@
-- PKIXProxy
-- This ASN.1 definition is taken from RFC3820 and modified to pass
--- through the ASN2ETH compiler.
+-- through the asn2wrs compiler.
--
-- The original copyright of the ASN.1 module follows below:
--
diff --git a/asn1/pkixqualified/PKIXqualified.asn b/asn1/pkixqualified/PKIXqualified.asn
index c01e78663d..b050ba6fcb 100644
--- a/asn1/pkixqualified/PKIXqualified.asn
+++ b/asn1/pkixqualified/PKIXqualified.asn
@@ -1,4 +1,4 @@
--- This ASN definition is taken from (and modified to pass through asn2eth)
+-- This ASN definition is taken from (and modified to pass through asn2wrs)
-- RFC3739
--
-- RFC3739 contains the followin copyright statements:
diff --git a/asn1/pkixtsp/PKIXTSP.asn b/asn1/pkixtsp/PKIXTSP.asn
index 306f4a9893..ce310a7a85 100644
--- a/asn1/pkixtsp/PKIXTSP.asn
+++ b/asn1/pkixtsp/PKIXTSP.asn
@@ -1,7 +1,7 @@
-- This ASN.1 definition defined the Time-Stamp Protocol
-- as of RFC3161.
-- This definition is taken from RFC3161 and modified to pass through
--- the ASN2ETH compiler.
+-- the asn2wrs compiler.
--
-- Copyright statement of the original ASN.1 definition of RFC3161 as follows
--
diff --git a/asn1/ranap/ranap.asn b/asn1/ranap/ranap.asn
index 9f3251df77..077d1a6920 100644
--- a/asn1/ranap/ranap.asn
+++ b/asn1/ranap/ranap.asn
@@ -6003,7 +6003,7 @@ ProcedureCode ::= INTEGER{
id-MBMSRABRelease ( 42 )
} (0..255)
--- Ethereal adapt.
+-- Wireshark adapt.
ProcedureCodeSuccessfulOutcome ::= INTEGER (0..255)
ProcedureCodeUnsuccessfulOutcome ::= INTEGER (0..255)
ProcedureCodeOutcome ::= INTEGER (0..255)
diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c
index f363aabf38..9ec29dacaa 100644
--- a/asn1/ros/packet-ros-template.c
+++ b/asn1/ros/packet-ros-template.c
@@ -106,7 +106,7 @@ call_ros_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *p
proto_item *item=NULL;
proto_tree *next_tree=NULL;
- item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "ROS: Dissector for OID:%s not implemented. Contact Ethereal developers if you want this supported", oid);
+ item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "ROS: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid);
if(item){
next_tree=proto_item_add_subtree(item, ett_ros_unknown);
}
diff --git a/asn1/ros/ros-exp.cnf b/asn1/ros/ros-exp.cnf
index 7dab68a242..599fdf283b 100644
--- a/asn1/ros/ros-exp.cnf
+++ b/asn1/ros/ros-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\ros-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn
+
+#.MODULE
+Remote-Operations-Generic-ROS-PDUs ros
+#.END
+
#.IMPORT_TAG
InvokeId BER_CLASS_ANY/*choice*/ -1/*choice*/
Code BER_CLASS_ANY/*choice*/ -1/*choice*/
diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c
index 0bbd504ea3..7ce9e0aabf 100644
--- a/asn1/rtse/packet-rtse-template.c
+++ b/asn1/rtse/packet-rtse-template.c
@@ -105,7 +105,7 @@ call_rtse_oid_callback(const char *oid, tvbuff_t *tvb, int offset, packet_info *
proto_item *item=NULL;
proto_tree *next_tree=NULL;
- item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "RTSE: Dissector for OID:%s not implemented. Contact Ethereal developers if you want this supported", oid);
+ item=proto_tree_add_text(tree, next_tvb, 0, tvb_length_remaining(tvb, offset), "RTSE: Dissector for OID:%s not implemented. Contact Wireshark developers if you want this supported", oid);
if(item){
next_tree=proto_item_add_subtree(item, ett_rtse_unknown);
}
diff --git a/asn1/rtse/rtse-exp.cnf b/asn1/rtse/rtse-exp.cnf
index 6609bbd417..6ec60d7eb5 100644
--- a/asn1/rtse/rtse-exp.cnf
+++ b/asn1/rtse/rtse-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\rtse-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn
+
+#.MODULE
+Reliable-Transfer-APDU rtse
+#.END
+
#.IMPORT_TAG
RTORQapdu BER_CLASS_UNI BER_UNI_TAG_SET
RTOACapdu BER_CLASS_UNI BER_UNI_TAG_SET
diff --git a/asn1/rtse/rtse.asn b/asn1/rtse/rtse.asn
index 1782b8d07a..453e27ae0d 100644
--- a/asn1/rtse/rtse.asn
+++ b/asn1/rtse/rtse.asn
@@ -1,6 +1,6 @@
-- RTSE definition from
-- http://www.itu.int/ITU-T/asn1/database/itu-t/x/x228/1988/Reliable-Transfer-APDU.html
--- and modified to pass through ASN2ETH
+-- and modified to pass through asn2wrs
--
--
-- Module Reliable-Transfer-APDU (X.228:11/1988)
@@ -139,9 +139,9 @@ AbortReason ::= INTEGER {
-- I can't use the ACSE External as it dispatches out of the
-- ber_callbacks and I want to dispatch out of the rtse_callbacks
--- Workaround for bug in ASN2ETH in the .cnf file
+-- Workaround for bug in asn2wrs in the .cnf file
-- to handle the lack of support for tagged assignments.
--- remove that workaround once asn2eth learns how to handle
+-- remove that workaround once asn2wrs learns how to handle
-- tagged assignments.
EXTERNAL ::= [UNIVERSAL 8] IMPLICIT SEQUENCE
{
diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf
index 8ba90ffed0..d36713f49a 100644
--- a/asn1/rtse/rtse.cnf
+++ b/asn1/rtse/rtse.cnf
@@ -100,7 +100,7 @@ EXTERNAL
guint32 len1;
if(!implicit_tag) {
- /* XXX asn2eth can not yet handle tagged assignment so for the
+ /* XXX asn2wrs can not yet handle tagged assignment so for the
* time being just remove this tag manually inside the EXTERNAL
* dissector.
*/
diff --git a/asn1/snmp/README.txt b/asn1/snmp/README.txt
index 656ccf771e..9e7c29c395 100644
--- a/asn1/snmp/README.txt
+++ b/asn1/snmp/README.txt
@@ -1,5 +1,5 @@
-This is a work in progress to enhance and replace the existing snmp dissector with an asn2eth generated one.
+This is a work in progress to enhance and replace the existing snmp dissector with an asn2wrs generated one.
-To test/use this work in progress dissector you will have to compile it with asn2eth and copy the resulting .c and .h files over to epan/dissectors.
+To test/use this work in progress dissector you will have to compile it with asn2wrs and copy the resulting .c and .h files over to epan/dissectors.
This dissector is not yet ready for public consumption and lacks many vital features of the existing snmp dissector. \ No newline at end of file
diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c
index 071b6a4ed0..2eb159430d 100644
--- a/asn1/snmp/packet-snmp-template.c
+++ b/asn1/snmp/packet-snmp-template.c
@@ -9,7 +9,7 @@
* See RFCs 1905, 1906, 1909, and 1910 for SNMPv2u [historic].
*
* See RFCs 2570-2576 for SNMPv3
- * Updated to use the asn2eth compiler made by Tomas Kukosa
+ * Updated to use the asn2wrs compiler made by Tomas Kukosa
* Copyright (C) 2005 - 2006 Anders Broman [AT] ericsson.com
*
*
@@ -1175,7 +1175,7 @@ dissect_snmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/*
* See if this looks like SNMP or not. if not, return 0 so
- * ethereal can try som other dissector instead.
+ * wireshark can try som other dissector instead.
*/
/* All SNMP packets are BER encoded and consist of a SEQUENCE
* that spans the entire PDU. The first item is an INTEGER that
@@ -1296,7 +1296,7 @@ process_prefs(void)
* Windows. Do the converse on non-Windows systems. This
* handles cases where we've copied a preferences file
* between a non-Windows box and a Windows box or upgraded
- * from an older version of Ethereal under Windows.
+ * from an older version of Wireshark under Windows.
*/
g_strdelimit(tmp_mib_modules, IMPORT_SEPARATOR, ENV_SEPARATOR_CHAR);
diff --git a/asn1/snmp/snmp.cnf b/asn1/snmp/snmp.cnf
index 6e9b0b49fe..f7f206aad4 100644
--- a/asn1/snmp/snmp.cnf
+++ b/asn1/snmp/snmp.cnf
@@ -34,7 +34,7 @@ gint pdu_type;
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -49,7 +49,7 @@ gint pdu_type;
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -64,7 +64,7 @@ gint pdu_type;
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -79,7 +79,7 @@ gint pdu_type;
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -95,7 +95,7 @@ gint pdu_type;
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -110,7 +110,7 @@ gint pdu_type;
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -125,7 +125,7 @@ gint pdu_type;
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -140,7 +140,7 @@ gint pdu_type;
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -155,7 +155,7 @@ gint pdu_type;
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c
index 7b5f981a9d..08c1f8d618 100644
--- a/asn1/spnego/packet-spnego-template.c
+++ b/asn1/spnego/packet-spnego-template.c
@@ -5,7 +5,7 @@
* Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com>
* Copyright 2003, Richard Sharpe <rsharpe@richardsharpe.com>
* Copyright 2005, Ronnie Sahlberg (krb decryption)
- * Copyright 2005, Anders Broman (converted to asn2eth generated dissector)
+ * Copyright 2005, Anders Broman (converted to asn2wrs generated dissector)
*
* $Id$
*
@@ -28,7 +28,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* The heimdal code for decryption of GSSAPI wrappers using heimdal comes from
- Heimdal 1.6 and has been modified for ethereal's requirements.
+ Heimdal 1.6 and has been modified for wireshark's requirements.
*/
#ifdef HAVE_CONFIG_H
@@ -89,7 +89,7 @@ static dissector_handle_t data_handle;
/*
* Unfortunately, we have to have a forward declaration of this,
- * as the code generated by asn2eth includes a call before the
+ * as the code generated by asn2wrs includes a call before the
* definition.
*/
static int dissect_spnego_PrincipalSeq(gboolean implicit_tag, tvbuff_t *tvb,
diff --git a/asn1/x411/x411-exp.cnf b/asn1/x411/x411-exp.cnf
index 44bb30935b..76eb79374f 100644
--- a/asn1/x411/x411-exp.cnf
+++ b/asn1/x411/x411-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\x411-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn
+
+#.MODULE
+MTAAbstractService x411
+#.END
+
#.IMPORT_TAG
SecurityContext BER_CLASS_UNI BER_UNI_TAG_SET
EncodedInformationTypesConstraints BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/x411/x411.asn b/asn1/x411/x411.asn
index 017d65364f..68e1415cff 100644
--- a/asn1/x411/x411.asn
+++ b/asn1/x411/x411.asn
@@ -187,7 +187,7 @@ MessageTransferEnvelope ::= SET {
originator-name MTAOriginatorName,
original-encoded-information-types OriginalEncodedInformationTypes OPTIONAL,
content-type ContentType,
--- asn2eth seems to have a problem with untagged choices - so we will expand 'in situ' for now
+-- asn2wrs seems to have a problem with untagged choices - so we will expand 'in situ' for now
-- it's not the greatest solution - but should be OK
-- built-in-content-type BuiltInContentType OPTIONAL,
-- extended-content-type ExtendedContentType OPTIONAL,
diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf
index 19b37cde39..d863933fbe 100644
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@@ -258,7 +258,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -280,7 +280,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
@@ -300,7 +300,7 @@ ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses"
guint32 len1;
if(!implicit_tag){
- /* XXX asn2eth can not yet handle tagged assignment yes so this
+ /* XXX asn2wrs can not yet handle tagged assignment yes so this
* XXX is some conformance file magic to work around that bug
*/
offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
diff --git a/asn1/x420/x420-exp.cnf b/asn1/x420/x420-exp.cnf
index 61af6bf794..2e0a43f535 100644
--- a/asn1/x420/x420-exp.cnf
+++ b/asn1/x420/x420-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\x420-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn
+
+#.MODULE
+IPMSInformationObjects x420
+#.END
+
#.IMPORT_TAG
InformationObject BER_CLASS_ANY/*choice*/ -1/*choice*/
IPM BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/x420/x420.asn b/asn1/x420/x420.asn
index 8a58ecd4fa..1422e9cadd 100644
--- a/asn1/x420/x420.asn
+++ b/asn1/x420/x420.asn
@@ -275,7 +275,7 @@ ExtensionsField ::= SET OF IPMSExtension --{{HeadingExtensions}}
-- Body
Body ::= SEQUENCE OF BodyPart
--- asn2eth seems to have problems with this CHOICE CHOICE
+-- asn2wrs seems to have problems with this CHOICE CHOICE
BodyPart ::= CHOICE {
-- basic
-- CHOICE { -- ia5-text [0] IA5TextBodyPart,
diff --git a/asn1/x509af/x509af-exp.cnf b/asn1/x509af/x509af-exp.cnf
index 111664f963..6be2ac9936 100644
--- a/asn1/x509af/x509af-exp.cnf
+++ b/asn1/x509af/x509af-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\x509af-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn
+
+#.MODULE
+AuthenticationFramework x509af
+#.END
+
#.IMPORT_TAG
Certificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
Version BER_CLASS_UNI BER_UNI_TAG_INTEGER
diff --git a/asn1/x509ce/x509ce-exp.cnf b/asn1/x509ce/x509ce-exp.cnf
index 50de440a24..c278497151 100644
--- a/asn1/x509ce/x509ce-exp.cnf
+++ b/asn1/x509ce/x509ce-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\x509ce-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn
+
+#.MODULE
+CertificateExtensions x509ce
+#.END
+
#.IMPORT_TAG
AuthorityKeyIdentifier BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
KeyIdentifier BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING
diff --git a/asn1/x509if/x509if-exp.cnf b/asn1/x509if/x509if-exp.cnf
index d1ba7c40ca..4a1907e8a4 100644
--- a/asn1/x509if/x509if-exp.cnf
+++ b/asn1/x509if/x509if-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\x509if-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn
+
+#.MODULE
+InformationFramework x509if
+#.END
+
#.IMPORT_TAG
AttributeValue BER_CLASS_ANY 0
Attribute BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/x509sat/SelectedAttributeTypes.asn b/asn1/x509sat/SelectedAttributeTypes.asn
index 31f8eedc0e..5bfd5449cc 100644
--- a/asn1/x509sat/SelectedAttributeTypes.asn
+++ b/asn1/x509sat/SelectedAttributeTypes.asn
@@ -1456,7 +1456,7 @@ id-at-pseudonym OBJECT IDENTIFIER ::= {id-at 65}
-- We add these in to give the low-level ASN.1 syntaxes
-- PrintableString and ObjectIdentifier are the most useful
-- Note the "Syntax" will be removed during the "make" - it is
--- present to stop asn2eth complaining about reserved words
+-- present to stop asn2wrs complaining about reserved words
--
ObjectIdentifier ::= OBJECT IDENTIFIER
diff --git a/asn1/x509sat/x509sat-exp.cnf b/asn1/x509sat/x509sat-exp.cnf
index 36a3c3e260..9be756f641 100644
--- a/asn1/x509sat/x509sat-exp.cnf
+++ b/asn1/x509sat/x509sat-exp.cnf
@@ -1,3 +1,12 @@
+# Do not modify this file.
+# It is created automatically by the ASN.1 to Wireshark dissector compiler
+# .\x509sat-exp.cnf
+# ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn
+
+#.MODULE
+SelectedAttributeTypes x509sat
+#.END
+
#.IMPORT_TAG
DirectoryString BER_CLASS_ANY/*choice*/ -1/*choice*/
UniqueIdentifier BER_CLASS_UNI BER_UNI_TAG_BITSTRING