EXTERNAL type is handled in asn2wrs now

private implementations were renamed EXTERNAL -> EXTERNALt

svn path=/trunk/; revision=21662

38 files changed, 76 insertions, 76 deletions

diff --git a/asn1/acse/acse-exp.cnf b/asn1/acse/acse-exp.cnf
index 059cda3589..0cef28cedf 100644
--- a/asn1/acse/acse-exp.cnf
+++ b/asn1/acse/acse-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./acse-exp.cnf
+# .\acse-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p acse -c acse.cnf -s packet-acse-template acse.asn
 
 #.MODULE
@@ -8,7 +8,7 @@ ACSE-1  acse
 #.END
 
 #.IMPORT_TAG
-EXTERNAL                 BER_CLASS_UNI 8
+EXTERNALt                BER_CLASS_UNI 8
 AP-title                 BER_CLASS_ANY/*choice*/ -1/*choice*/
 AE-qualifier             BER_CLASS_ANY/*choice*/ -1/*choice*/
 ASO-qualifier            BER_CLASS_ANY/*choice*/ -1/*choice*/
@@ -17,7 +17,7 @@ AP-invocation-identifier BER_CLASS_UNI BER_UNI_TAG_INTEGER
 #.END
 
 #.TYPE_ATTR
-EXTERNAL                 TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+EXTERNALt                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 AP-title                 TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(acse_AP_title_vals)  BITMASK = 0
 AE-qualifier             TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(acse_ASO_qualifier_vals)  BITMASK = 0
 ASO-qualifier            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(acse_ASO_qualifier_vals)  BITMASK = 0
diff --git a/asn1/acse/acse.asn b/asn1/acse/acse.asn
index d012010532..1b250ffb43 100644
--- a/asn1/acse/acse.asn
+++ b/asn1/acse/acse.asn
@@ -22,7 +22,7 @@ IMPORTS
 -- to handle the lack of support for tagged assignments.
 -- remove that workaround once asn2wrs learns how to handle
 -- tagged assignments.
-EXTERNAL  ::=  [UNIVERSAL 8] IMPLICIT SEQUENCE
+EXTERNALt  ::=  [UNIVERSAL 8] IMPLICIT SEQUENCE
      {
       direct-reference  OBJECT IDENTIFIER OPTIONAL,
       indirect-reference  INTEGER OPTIONAL,
@@ -367,7 +367,7 @@ Associate-source-diagnostic ::= CHOICE {
 
 User-information ::= Association-data
 
-Association-data ::= SEQUENCE OF EXTERNAL
+Association-data ::= SEQUENCE OF EXTERNALt
 
 Simply-encoded-data ::= OCTET STRING
 
@@ -405,7 +405,7 @@ Authentication-value-other ::= SEQUENCE {
 Authentication-value ::= CHOICE {
   charstring  [0] IMPLICIT GraphicString,
   bitstring   [1] IMPLICIT BIT STRING,
-  external    [2] IMPLICIT EXTERNAL,
+  external    [2] IMPLICIT EXTERNALt,
   other
     [3] IMPLICIT Authentication-value-other
 }
diff --git a/asn1/acse/acse.cnf b/asn1/acse/acse.cnf
index 4ac0e7424b..5447c3314d 100644
--- a/asn1/acse/acse.cnf
+++ b/asn1/acse/acse.cnf
@@ -6,7 +6,7 @@
 #.INCLUDE ../x509if/x509if-exp.cnf
 
 #.EXPORTS
-EXTERNAL
+EXTERNALt
 AP-title
 AP-invocation-identifier
 AE-qualifier
@@ -37,7 +37,7 @@ AARQ-apdu/aSO-context-name	aARQ_aSO_context_name
 AARE-apdu/aSO-context-name	aARE_aSO_context_name
 ACRQ-apdu/aSO-context-name	aCRQ_aSO_context_name
 
-#.FN_BODY EXTERNAL
+#.FN_BODY EXTERNALt
   gint8 class;
   gboolean pc, ind_field;
   gint32 tag;
@@ -52,7 +52,7 @@ ACRQ-apdu/aSO-context-name	aCRQ_aSO_context_name
      offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
    }
    offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset,
-                                EXTERNAL_sequence, hf_index, ett_acse_EXTERNAL);
+                                EXTERNALt_sequence, hf_index, ett_acse_EXTERNALt);
 
 #.FN_PARS Authentication-value-other/other-mechanism-name  
   FN_VARIANT = _str VAL_PTR = &object_identifier_id
@@ -79,7 +79,7 @@ ACRQ-apdu/aSO-context-name	aCRQ_aSO_context_name
   offset = dissect_ber_object_identifier_str(FALSE, pinfo, tree, tvb, offset,
                                          hf_index, &object_identifier_id);
 
-#.FN_BODY EXTERNAL/indirect-reference
+#.FN_BODY EXTERNALt/indirect-reference
   char *oid;
   offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset,
                 hf_acse_indirect_reference,
@@ -93,10 +93,10 @@ ACRQ-apdu/aSO-context-name	aCRQ_aSO_context_name
   if(session)
 	session->pres_ctx_id = indir_ref;
 
-#.FN_PARS EXTERNAL/direct-reference
+#.FN_PARS EXTERNALt/direct-reference
   FN_VARIANT = _str VAL_PTR = &object_identifier_id
 
-#.FN_BODY EXTERNAL/encoding/single-ASN1-type
+#.FN_BODY EXTERNALt/encoding/single-ASN1-type
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, top_tree ? top_tree : tree);
 
 #.FN_PARS Release-request-reason
diff --git a/asn1/cdt/cdt-exp.cnf b/asn1/cdt/cdt-exp.cnf
index 259c10aaae..57d8607f11 100644
--- a/asn1/cdt/cdt-exp.cnf
+++ b/asn1/cdt/cdt-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./cdt-exp.cnf
+# .\cdt-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p cdt -c cdt.cnf -s packet-cdt-template cdt.asn
 
 #.MODULE
diff --git a/asn1/cmip/CMIP.asn b/asn1/cmip/CMIP.asn
index 1a9e2304f7..a00ef2233b 100644
--- a/asn1/cmip/CMIP.asn
+++ b/asn1/cmip/CMIP.asn
@@ -7,7 +7,7 @@ BEGIN
 
 	IMPORTS
 
-  EXTERNAL
+  EXTERNALt
     FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) acse1(1) version1(1)};
 
 
@@ -370,7 +370,7 @@ Scope ::= CHOICE {
 CMISSync ::= ENUMERATED {bestEffort(0), atomic(1)}
 
 -- Supporting type definitions
-AccessControl ::= EXTERNAL
+AccessControl ::= EXTERNALt
 
 
 GetArgument ::= SEQUENCE {
@@ -496,7 +496,7 @@ ROS ::= CHOICE {
 --      Information carried in user-information parameter of A-ABORT
 CMIPAbortInfo ::= SEQUENCE {
   abortSource  [0] IMPLICIT CMIPAbortSource,
-  userInfo     [1]  EXTERNAL OPTIONAL
+  userInfo     [1]  EXTERNALt OPTIONAL
 }
 
 CMIPAbortSource ::= ENUMERATED {cmiseServiceUser(0), cmiseServiceProvider(1)}
@@ -514,8 +514,8 @@ FunctionalUnits ::= BIT STRING {
 CMIPUserInfo ::= SEQUENCE {
   protocolVersion  [0] IMPLICIT ProtocolVersion OPTIONAL,
   functionalUnits  [1] IMPLICIT FunctionalUnits OPTIONAL,
-  accessControl    [2]  EXTERNAL OPTIONAL,
-  userInfo         [3]  EXTERNAL OPTIONAL
+  accessControl    [2]  EXTERNALt OPTIONAL,
+  userInfo         [3]  EXTERNALt OPTIONAL
 }
 
 ProtocolVersion ::= BIT STRING {version1(0), version2(1)}
diff --git a/asn1/cmip/cmip-exp.cnf b/asn1/cmip/cmip-exp.cnf
index 136632fbaa..b804b825c9 100644
--- a/asn1/cmip/cmip-exp.cnf
+++ b/asn1/cmip/cmip-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./cmip-exp.cnf
+# .\cmip-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p cmip -c cmip.cnf -s packet-cmip-template CMIP.asn
 
 #.MODULE
diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf
index 0eb30a20a9..255723b55d 100644
--- a/asn1/cms/cms-exp.cnf
+++ b/asn1/cms/cms-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./cms-exp.cnf
+# .\cms-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p cms -c cms.cnf -s packet-cms-template CryptographicMessageSyntax.asn
 
 #.MODULE
diff --git a/asn1/dap/dap-exp.cnf b/asn1/dap/dap-exp.cnf
index 98539a3205..f767e3351a 100644
--- a/asn1/dap/dap-exp.cnf
+++ b/asn1/dap/dap-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./dap-exp.cnf
+# .\dap-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p dap -c dap.cnf -s packet-dap-template dap.asn
 
 #.MODULE
diff --git a/asn1/dap/dap.asn b/asn1/dap/dap.asn
index de2dcd2c3b..61e3af7113 100644
--- a/asn1/dap/dap.asn
+++ b/asn1/dap/dap.asn
@@ -75,7 +75,7 @@ IMPORTS
 --  SPKM-ERROR, SPKM-REP-TI, SPKM-REQ
 --    FROM SpkmGssTokens {iso(1) identified-organization(3) dod(6) internet(1)
 --      security(5) mechanisms(5) spkm(1) spkmGssTokens(10)};
-  EXTERNAL 
+  EXTERNALt 
     FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) acse1(1) version1(1)};
 
 -- Common data types 
@@ -301,7 +301,7 @@ DirectoryBindArgument ::= SET {
 Credentials ::= CHOICE {
   simple             [0]  SimpleCredentials,
   strong             [1]  StrongCredentials,
-  externalProcedure  [2]  EXTERNAL,
+  externalProcedure  [2]  EXTERNALt,
   spkm               [3]  SpkmCredentials
 }
 
diff --git a/asn1/disp/disp-exp.cnf b/asn1/disp/disp-exp.cnf
index 82f1ce83fe..c92d1d271f 100644
--- a/asn1/disp/disp-exp.cnf
+++ b/asn1/disp/disp-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./disp-exp.cnf
+# .\disp-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p disp -c disp.cnf -s packet-disp-template disp.asn
 
 #.MODULE
diff --git a/asn1/disp/disp.asn b/asn1/disp/disp.asn
index f52e41935a..0ab0cfbc58 100644
--- a/asn1/disp/disp.asn
+++ b/asn1/disp/disp.asn
@@ -47,7 +47,7 @@ IMPORTS
     shadowConsumerInitiatedAC, shadowSupplierInitiatedAC
     FROM DirectoryInformationShadowProtocol {joint-iso-itu-t ds(5) module(1)
       disp(16) 4}
-  EXTERNAL 
+  EXTERNALt 
     FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) acse1(1) version1(1)}
   AlgorithmIdentifier, CertificationPath, ENCRYPTED{}, SIGNATURE{}, SIGNED{}
     FROM AuthenticationFramework {joint-iso-itu-t ds(5) module(1)
@@ -193,7 +193,7 @@ CoordinateShadowUpdateArgumentData ::=
                       CHOICE {standard
                                 ENUMERATED {noChanges(0), incremental(1),
                                             total(2)},
-                              other     EXTERNAL},
+                              other     EXTERNALt},
                     securityParameters  SecurityParameters OPTIONAL} --}
 
 -- expand OPTIONALLY-PROTECTED macro
@@ -250,7 +250,7 @@ RequestShadowUpdateArgumentData ::=
                     lastUpdate          Time OPTIONAL,
                     requestedStrategy
                       CHOICE {standard  ENUMERATED {incremental(1), total(2)},
-                              other     EXTERNAL},
+                              other     EXTERNALt},
                     securityParameters  SecurityParameters OPTIONAL} --}
 
 -- expand OPTIONALLY-PROTECTED macro
@@ -316,7 +316,7 @@ RefreshInformation ::= CHOICE {
   noRefresh      NULL,
   total          [0]  TotalRefresh,
   incremental    [1]  IncrementalRefresh,
-  otherStrategy  EXTERNAL
+  otherStrategy  EXTERNALt
 }
 
 TotalRefresh ::= SEQUENCE {
diff --git a/asn1/dop/dop-exp.cnf b/asn1/dop/dop-exp.cnf
index 2583e73432..1d6a8d3567 100644
--- a/asn1/dop/dop-exp.cnf
+++ b/asn1/dop/dop-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./dop-exp.cnf
+# .\dop-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p dop -c dop.cnf -s packet-dop-template dop.asn
 
 #.MODULE
diff --git a/asn1/dop/dop.asn b/asn1/dop/dop.asn
index 8c0cfc8583..99de44df12 100644
--- a/asn1/dop/dop.asn
+++ b/asn1/dop/dop.asn
@@ -45,7 +45,7 @@ IMPORTS
   Filter
     FROM DirectoryAbstractService {joint-iso-itu-t ds(5) module(1)
       directoryAbstractService(2) 4}
-  EXTERNAL 
+  EXTERNALt 
     FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) acse1(1) version1(1)};
 
 -- data types 
@@ -792,7 +792,7 @@ AuthenticationLevel ::= CHOICE {
     SEQUENCE {level           ENUMERATED {none(0), simple(1), strong(2)},
               localQualifier  INTEGER OPTIONAL,
               signed          BOOLEAN DEFAULT FALSE},
-  other        EXTERNAL
+  other        EXTERNALt
 }
 
 GrantsAndDenials ::= BIT STRING {
diff --git a/asn1/dsp/dsp-exp.cnf b/asn1/dsp/dsp-exp.cnf
index 075ef3d107..c9b30f6283 100644
--- a/asn1/dsp/dsp-exp.cnf
+++ b/asn1/dsp/dsp-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./dsp-exp.cnf
+# .\dsp-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p dsp -c dsp.cnf -s packet-dsp-template dsp.asn
 
 #.MODULE
diff --git a/asn1/dsp/dsp.asn b/asn1/dsp/dsp.asn
index 3f72c1514c..1a0378951b 100644
--- a/asn1/dsp/dsp.asn
+++ b/asn1/dsp/dsp.asn
@@ -49,7 +49,7 @@ IMPORTS
   ERROR, OPERATION
     FROM Remote-Operations-Information-Objects {joint-iso-itu-t
       remote-operations(4) informationObjects(5) version1(0)}--;
-  EXTERNAL 
+  EXTERNALt 
     FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) acse1(1) version1(1)}
   AlgorithmIdentifier
     FROM AuthenticationFramework {joint-iso-itu-t ds(5) module(1)
@@ -471,7 +471,7 @@ AuthenticationLevel ::= CHOICE {
     localQualifier	INTEGER OPTIONAL,
     signed		BOOLEAN DEFAULT FALSE
   },
-  other	EXTERNAL
+  other	EXTERNALt
 }
 
 END -- DistributedOperations
diff --git a/asn1/ftam/ISO8571-FTAM.asn b/asn1/ftam/ISO8571-FTAM.asn
index c57625814d..3a24a09b29 100644
--- a/asn1/ftam/ISO8571-FTAM.asn
+++ b/asn1/ftam/ISO8571-FTAM.asn
@@ -11,7 +11,7 @@ ISO8571-FTAM {iso(1) standard(0) 8571 application-context(1) iso-ftam(1)} DEFINI
 BEGIN
 
 IMPORTS
-  EXTERNAL
+  EXTERNALt
     FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) acse1(1) version1(1)};
 
 PDU ::= CHOICE {
@@ -760,7 +760,7 @@ FADU-Identity ::= [APPLICATION 15]  CHOICE {
 }
 
 -- As defined in ISO 8571-2.
-Node-Name ::= EXTERNAL
+Node-Name ::= EXTERNALt
 
 -- The type to be used for Node-Name is defined in IS08571-FADU.
 --
@@ -987,7 +987,7 @@ Private-Use-Attribute ::= CHOICE {
   -- This value shall only appear in response PDUs.
   abstract-Syntax-not-supported  [1] IMPLICIT NULL,
   -- Indicates that abstract Syntax is not available.
-  actual-values                  [2] IMPLICIT EXTERNAL
+  actual-values                  [2] IMPLICIT EXTERNALt
 }
 
 Object-Type-Attribute ::= INTEGER {file(0), file-directory(1), reference(2)}
@@ -1594,7 +1594,7 @@ AE-title ::= SEQUENCE {ap  AP-title,
 -- XXX Bug in asn2wrs that can not handle tagged assignements
 -- XXX woraround implemented in teh conformance file
 --
-Shared-ASE-Information ::= [APPLICATION 20] IMPLICIT EXTERNAL
+Shared-ASE-Information ::= [APPLICATION 20] IMPLICIT EXTERNALt
 
 --
 -- XXX Bug in asn2wrs that can not handle tagged assignements
diff --git a/asn1/ftam/ftam-exp.cnf b/asn1/ftam/ftam-exp.cnf
index 30e21a7f23..bcf2635805 100644
--- a/asn1/ftam/ftam-exp.cnf
+++ b/asn1/ftam/ftam-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./ftam-exp.cnf
+# .\ftam-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p ftam -c ftam.cnf -s packet-ftam-template ISO8571-FTAM.asn
 
 #.MODULE
diff --git a/asn1/ftam/ftam.cnf b/asn1/ftam/ftam.cnf
index 2ea870f35e..37330bbd9f 100644
--- a/asn1/ftam/ftam.cnf
+++ b/asn1/ftam/ftam.cnf
@@ -610,7 +610,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
     offset = get_ber_identifier(tvb, offset, &class, &pc, &tag);
     offset = get_ber_length(tree, tvb, offset, &len1, &ind_field);
  }
-  offset = dissect_acse_EXTERNAL(TRUE, tvb, offset, pinfo, tree, hf_index);
+  offset = dissect_acse_EXTERNALt(TRUE, tvb, offset, pinfo, tree, hf_index);
 
 #.FN_BODY Attribute-Value-Assertions
  gint8 class;
diff --git a/asn1/ftbp/ftbp.asn b/asn1/ftbp/ftbp.asn
index 802e4147b9..74a1f9f70e 100644
--- a/asn1/ftbp/ftbp.asn
+++ b/asn1/ftbp/ftbp.asn
@@ -14,7 +14,7 @@ IMPORTS
     --==
     FROM ISO8571-FTAM {iso standard 8571 application-context(1) iso-ftam(1)}
   -- ACSE definitions of AP-title and AE-qualifier
-  EXTERNAL, 
+  EXTERNALt, 
   AE-qualifier, AP-title
     --==
     FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) apdus(0)
@@ -57,7 +57,7 @@ FileTransferParameters ::= SEQUENCE {
   extensions           [5]  ExtensionsField OPTIONAL
 }
 
-FileTransferData ::= SEQUENCE OF EXTERNAL
+FileTransferData ::= SEQUENCE OF EXTERNALt
 
 -- This conveys a sequence of data values representing file contents;
 -- The rules for generating this sequence are implied by the value of the contents-type parameter.
diff --git a/asn1/mms/mms.asn b/asn1/mms/mms.asn
index d7d9a7b895..21bbe2fc1d 100644
--- a/asn1/mms/mms.asn
+++ b/asn1/mms/mms.asn
@@ -17,7 +17,7 @@ BEGIN
 EXPORTS MMSpdu;
 
 IMPORTS
-        EXTERNAL,
+        EXTERNALt,
 	AP-title,
 	AP-invocation-identifier,
 	AE-qualifier,
@@ -836,7 +836,7 @@ DownloadSegment-Response ::= SEQUENCE
 	{
 	loadData	CHOICE {
 	   non-coded		[0] IMPLICIT OCTET STRING,
-	   coded		EXTERNAL
+	   coded		EXTERNALt
 	   },
 	moreFollows	[1] IMPLICIT BOOLEAN DEFAULT TRUE
 	}
@@ -869,7 +869,7 @@ UploadSegment-Response ::= SEQUENCE
 	{
 	loadData	CHOICE {
 	   non-coded		[0] IMPLICIT OCTET STRING,
-	   coded		EXTERNAL
+	   coded		EXTERNALt
 	   },
 	moreFollows	[1] IMPLICIT BOOLEAN DEFAULT TRUE
 	}
@@ -995,7 +995,7 @@ Start-Request ::= SEQUENCE
 	programInvocationName 	[0] IMPLICIT Identifier,
 	executionArgument	CHOICE {
 	    simpleString	  [1] IMPLICIT VisibleString,
-	    encodedString	  EXTERNAL
+	    encodedString	  EXTERNALt
 	    } OPTIONAL
 	}
 
@@ -1021,7 +1021,7 @@ Resume-Request ::= SEQUENCE
 	programInvocationName 	[0] IMPLICIT Identifier,
 	executionArgument	CHOICE {
 	    simpleString	  [1] IMPLICIT VisibleString,
-	    encodedString	  EXTERNAL
+	    encodedString	  EXTERNALt
 	    } OPTIONAL
 	}
 
@@ -1063,7 +1063,7 @@ GetProgramInvocationAttributes-Response ::= SEQUENCE
 	startArgument		[5] IMPLICIT VisibleString,
 	executionArgument	CHOICE {
 	    simpleString	  [1] IMPLICIT VisibleString,
-	    encodedString	  EXTERNAL
+	    encodedString	  EXTERNALt
 	    } OPTIONAL
 	}
 
diff --git a/asn1/pkix1explicit/pkix1explicit-exp.cnf b/asn1/pkix1explicit/pkix1explicit-exp.cnf
index a2dd2fb5c0..644164ac12 100644
--- a/asn1/pkix1explicit/pkix1explicit-exp.cnf
+++ b/asn1/pkix1explicit/pkix1explicit-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./pkix1explicit-exp.cnf
+# .\pkix1explicit-exp.cnf
 # ../../tools/asn2wrs.py -e -b -p pkix1explicit -c pkix1explicit.cnf -s packet-pkix1explicit-template PKIX1EXPLICIT93.asn
 
 #.MODULE
diff --git a/asn1/pkix1implicit/pkix1implicit-exp.cnf b/asn1/pkix1implicit/pkix1implicit-exp.cnf
index 9190b0e2fc..42a81a46e0 100644
--- a/asn1/pkix1implicit/pkix1implicit-exp.cnf
+++ b/asn1/pkix1implicit/pkix1implicit-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./pkix1implicit-exp.cnf
+# .\pkix1implicit-exp.cnf
 # ../../tools/asn2wrs.py -e -b -p pkix1implicit -c pkix1implicit.cnf -s packet-pkix1implicit-template PKIX1IMPLICIT93.asn
 
 #.MODULE
diff --git a/asn1/pkixcmp/cmp-exp.cnf b/asn1/pkixcmp/cmp-exp.cnf
index d09232df9e..7b448b761c 100644
--- a/asn1/pkixcmp/cmp-exp.cnf
+++ b/asn1/pkixcmp/cmp-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./cmp-exp.cnf
+# .\cmp-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p cmp -c cmp.cnf -s packet-cmp-template CMP.asn
 
 #.MODULE
diff --git a/asn1/pkixcrmf/crmf-exp.cnf b/asn1/pkixcrmf/crmf-exp.cnf
index f47a763ac4..02a06d1226 100644
--- a/asn1/pkixcrmf/crmf-exp.cnf
+++ b/asn1/pkixcrmf/crmf-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./crmf-exp.cnf
+# .\crmf-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p crmf -c crmf.cnf -s packet-crmf-template CRMF.asn
 
 #.MODULE
diff --git a/asn1/qsig/qsig-exp.cnf b/asn1/qsig/qsig-exp.cnf
index 8ab5d3693e..180d21c136 100644
--- a/asn1/qsig/qsig-exp.cnf
+++ b/asn1/qsig/qsig-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./qsig-exp.cnf
+# .\qsig-exp.cnf
 # ../../tools/asn2wrs.py -b -T -e -p qsig -c qsig.cnf -s packet-qsig-template qsig-gf-ext.asn qsig-gf-gp.asn qsig-gf-ade.asn qsig-na.asn qsig-cf.asn
 
 #.MODULE
diff --git a/asn1/ros/ros-exp.cnf b/asn1/ros/ros-exp.cnf
index 468a4b2646..599fdf283b 100644
--- a/asn1/ros/ros-exp.cnf
+++ b/asn1/ros/ros-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./ros-exp.cnf
+# .\ros-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn
 
 #.MODULE
diff --git a/asn1/rtse/rtse-exp.cnf b/asn1/rtse/rtse-exp.cnf
index df55207f75..da343754de 100644
--- a/asn1/rtse/rtse-exp.cnf
+++ b/asn1/rtse/rtse-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./rtse-exp.cnf
+# .\rtse-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p rtse -c rtse.cnf -s packet-rtse-template rtse.asn
 
 #.MODULE
@@ -12,7 +12,7 @@ RTORQapdu                BER_CLASS_UNI BER_UNI_TAG_SET
 RTOACapdu                BER_CLASS_UNI BER_UNI_TAG_SET
 RTORJapdu                BER_CLASS_UNI BER_UNI_TAG_SET
 RTABapdu                 BER_CLASS_UNI BER_UNI_TAG_SET
-EXTERNAL                 BER_CLASS_UNI 8
+EXTERNALt                BER_CLASS_UNI 8
 #.END
 
 #.TYPE_ATTR
@@ -20,6 +20,6 @@ RTORQapdu                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL
 RTOACapdu                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 RTORJapdu                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 RTABapdu                 TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-EXTERNAL                 TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
+EXTERNALt                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 #.END
 
diff --git a/asn1/rtse/rtse.asn b/asn1/rtse/rtse.asn
index 453e27ae0d..e481f358ee 100644
--- a/asn1/rtse/rtse.asn
+++ b/asn1/rtse/rtse.asn
@@ -143,7 +143,7 @@ AbortReason ::= INTEGER {
 -- to handle the lack of support for tagged assignments.
 -- remove that workaround once asn2wrs learns how to handle
 -- tagged assignments.
-EXTERNAL  ::=  [UNIVERSAL 8] IMPLICIT SEQUENCE
+EXTERNALt  ::=  [UNIVERSAL 8] IMPLICIT SEQUENCE
      {
       direct-reference  OBJECT IDENTIFIER OPTIONAL,
       indirect-reference  INTEGER OPTIONAL,
diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf
index d36713f49a..d3ea8f5a71 100644
--- a/asn1/rtse/rtse.cnf
+++ b/asn1/rtse/rtse.cnf
@@ -3,7 +3,7 @@ RTORQapdu
 RTOACapdu
 RTORJapdu
 RTABapdu
-EXTERNAL
+EXTERNALt
 
 #.FN_BODY RTORJapdu/userDataRJ
 	char *oid = NULL;
@@ -89,11 +89,11 @@ EXTERNAL
 		if(session)
 			session->ros_op = (ROS_OP_INVOKE | ROS_OP_ARGUMENT);
 
-		offset = dissect_rtse_EXTERNAL(FALSE, next_tvb, 0, pinfo, tree, -1);
+		offset = dissect_rtse_EXTERNALt(FALSE, next_tvb, 0, pinfo, tree, -1);
 
 	}
 
-#.FN_BODY EXTERNAL
+#.FN_BODY EXTERNALt
   gint8 class;
   gboolean pc, ind_field;
   gint32 tag;
@@ -109,9 +109,9 @@ EXTERNAL
    }
 
    offset = dissect_ber_sequence(TRUE, pinfo, tree, tvb, offset,
-                                EXTERNAL_sequence, hf_index, ett_rtse_EXTERNAL);
+                                EXTERNALt_sequence, hf_index, ett_rtse_EXTERNALt);
 
-#.FN_BODY EXTERNAL/indirect-reference
+#.FN_BODY EXTERNALt/indirect-reference
   char *oid;
 
   offset = dissect_ber_integer(FALSE, pinfo, tree, tvb, offset,
@@ -124,7 +124,7 @@ EXTERNAL
   }
 	
 
-#.FN_BODY EXTERNAL/encoding/single-ASN1-type
+#.FN_BODY EXTERNALt/encoding/single-ASN1-type
   offset=call_rtse_oid_callback(object_identifier_id, tvb, offset, pinfo, top_tree);
 
 
diff --git a/asn1/snmp/snmp-exp.cnf b/asn1/snmp/snmp-exp.cnf
index bd76365495..8f8c4e0271 100644
--- a/asn1/snmp/snmp-exp.cnf
+++ b/asn1/snmp/snmp-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./snmp-exp.cnf
+# .\snmp-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p snmp -c snmp.cnf -s packet-snmp-template snmp.asn
 
 #.MODULE
diff --git a/asn1/x411/x411-exp.cnf b/asn1/x411/x411-exp.cnf
index abf45fd5c5..b13032e99d 100644
--- a/asn1/x411/x411-exp.cnf
+++ b/asn1/x411/x411-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./x411-exp.cnf
+# .\x411-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn
 
 #.MODULE
diff --git a/asn1/x411/x411.asn b/asn1/x411/x411.asn
index 241957b8b2..2c698a6b47 100644
--- a/asn1/x411/x411.asn
+++ b/asn1/x411/x411.asn
@@ -76,7 +76,7 @@ IMPORTS
     --==
     FROM AuthenticationFramework {joint-iso-itu-t ds(5) module(1)
       authenticationFramework(7) 3} 
-  EXTERNAL
+  EXTERNALt
     --==
     FROM ACSE-1;
 
@@ -2919,7 +2919,7 @@ EncryptionKey ::= BIT STRING
 --  IDENTIFIED BY  4
 --}
 
-BindTokenEncryptedData ::= EXTERNAL
+BindTokenEncryptedData ::= EXTERNALt
 
 --	Security Label
 SecurityLabel ::= SET {
diff --git a/asn1/x420/x420-exp.cnf b/asn1/x420/x420-exp.cnf
index 551c7d9be9..a2a0b88f62 100644
--- a/asn1/x420/x420-exp.cnf
+++ b/asn1/x420/x420-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./x420-exp.cnf
+# .\x420-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p x420 -c x420.cnf -s packet-x420-template x420.asn
 
 #.MODULE
diff --git a/asn1/x420/x420.asn b/asn1/x420/x420.asn
index 1422e9cadd..8fa7de8a8f 100644
--- a/asn1/x420/x420.asn
+++ b/asn1/x420/x420.asn
@@ -94,7 +94,7 @@ IMPORTS
     --==
 --    FROM IPMSObjectIdentifiers {joint-iso-itu-t mhs(6) ipms(1) modules(0)
 --      object-identifiers(0) version-1999(1)} ; --
-    EXTERNAL 
+    EXTERNALt 
     FROM ACSE-1
   CertificateAssertion
     --==
@@ -294,8 +294,8 @@ BodyPart ::= CHOICE {
 
 -- Extended body part
 ExtendedBodyPart --{EXTENDED-BODY-PART-TYPE:IPMBodyPartTable}-- ::= SEQUENCE {
-  parameters  [0]  EXTERNAL, --INSTANCE OF TYPE-IDENTIFIER OPTIONAL,
-  data        EXTERNAL -- INSTANCE OF TYPE-IDENTIFIER
+  parameters  [0]  EXTERNALt, --INSTANCE OF TYPE-IDENTIFIER OPTIONAL,
+  data        EXTERNALt -- INSTANCE OF TYPE-IDENTIFIER
 }
 --(CONSTRAINED BY { - - must correspond to the &parameters field and &data field of a member of --
 --   IPMBodyPartTable})
diff --git a/asn1/x509af/x509af-exp.cnf b/asn1/x509af/x509af-exp.cnf
index 817623089f..6be2ac9936 100644
--- a/asn1/x509af/x509af-exp.cnf
+++ b/asn1/x509af/x509af-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./x509af-exp.cnf
+# .\x509af-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p x509af -c x509af.cnf -s packet-x509af-template AuthenticationFramework.asn
 
 #.MODULE
diff --git a/asn1/x509ce/x509ce-exp.cnf b/asn1/x509ce/x509ce-exp.cnf
index 147a278d18..c278497151 100644
--- a/asn1/x509ce/x509ce-exp.cnf
+++ b/asn1/x509ce/x509ce-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./x509ce-exp.cnf
+# .\x509ce-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p x509ce -c x509ce.cnf -s packet-x509ce-template CertificateExtensions.asn
 
 #.MODULE
diff --git a/asn1/x509if/x509if-exp.cnf b/asn1/x509if/x509if-exp.cnf
index d83732262e..4a1907e8a4 100644
--- a/asn1/x509if/x509if-exp.cnf
+++ b/asn1/x509if/x509if-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./x509if-exp.cnf
+# .\x509if-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p x509if -c x509if.cnf -s packet-x509if-template InformationFramework.asn
 
 #.MODULE
diff --git a/asn1/x509sat/x509sat-exp.cnf b/asn1/x509sat/x509sat-exp.cnf
index 6def1c478d..9be756f641 100644
--- a/asn1/x509sat/x509sat-exp.cnf
+++ b/asn1/x509sat/x509sat-exp.cnf
@@ -1,6 +1,6 @@
 # Do not modify this file.
 # It is created automatically by the ASN.1 to Wireshark dissector compiler
-# ./x509sat-exp.cnf
+# .\x509sat-exp.cnf
 # ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn
 
 #.MODULE