- remove some #.MODULE_IMPORT from .cng files

- regenerate BER dissectors so as to change rest of Ethereal->Wireshark and asn2eth -> asn2wrs

svn path=/trunk/; revision=18217

1 files changed, 33 insertions, 33 deletions

diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index 5e314e19dc..28cf0005b5 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
-/* It is created automatically by the ASN.1 to Wireshark dissector compiler    */
-/* ./packet-x509sat.c                                                         */
-/* ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
+/* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
+/* .\packet-x509sat.c                                                         */
+/* ../../tools/asn2wrs.py -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */
 
 /* Input file: packet-x509sat-template.c */
 
@@ -2138,65 +2138,65 @@ void proto_register_x509sat(void) {
         FT_BOOLEAN, 8, NULL, 0,
         "Boolean", HFILL }},
     { &hf_x509sat_SyntaxGeneralizedTime_PDU,
-      { "GeneralizedTime", "x509sat.GeneralizedTime",
+      { "SyntaxGeneralizedTime", "x509sat.SyntaxGeneralizedTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "GeneralizedTime", HFILL }},
+        "SyntaxGeneralizedTime", HFILL }},
     { &hf_x509sat_SyntaxUTCTime_PDU,
-      { "UTCTime", "x509sat.UTCTime",
+      { "SyntaxUTCTime", "x509sat.SyntaxUTCTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "UTCTime", HFILL }},
+        "SyntaxUTCTime", HFILL }},
     { &hf_x509sat_SyntaxNumericString_PDU,
-      { "NumericString", "x509sat.NumericString",
+      { "SyntaxNumericString", "x509sat.SyntaxNumericString",
         FT_STRING, BASE_NONE, NULL, 0,
-        "NumericString", HFILL }},
+        "SyntaxNumericString", HFILL }},
     { &hf_x509sat_SyntaxPrintableString_PDU,
-      { "PrintableString", "x509sat.PrintableString",
+      { "SyntaxPrintableString", "x509sat.SyntaxPrintableString",
         FT_STRING, BASE_NONE, NULL, 0,
-        "PrintableString", HFILL }},
+        "SyntaxPrintableString", HFILL }},
     { &hf_x509sat_SyntaxIA5String_PDU,
-      { "IA5String", "x509sat.IA5String",
+      { "SyntaxIA5String", "x509sat.SyntaxIA5String",
         FT_STRING, BASE_NONE, NULL, 0,
-        "IA5String", HFILL }},
+        "SyntaxIA5String", HFILL }},
     { &hf_x509sat_SyntaxBMPString_PDU,
-      { "BMPString", "x509sat.BMPString",
+      { "SyntaxBMPString", "x509sat.SyntaxBMPString",
         FT_STRING, BASE_NONE, NULL, 0,
-        "BMPString", HFILL }},
+        "SyntaxBMPString", HFILL }},
     { &hf_x509sat_SyntaxUniversalString_PDU,
-      { "UniversalString", "x509sat.UniversalString",
+      { "SyntaxUniversalString", "x509sat.SyntaxUniversalString",
         FT_STRING, BASE_NONE, NULL, 0,
-        "UniversalString", HFILL }},
+        "SyntaxUniversalString", HFILL }},
     { &hf_x509sat_SyntaxUTF8String_PDU,
-      { "UTF8String", "x509sat.UTF8String",
+      { "SyntaxUTF8String", "x509sat.SyntaxUTF8String",
         FT_STRING, BASE_NONE, NULL, 0,
-        "UTF8String", HFILL }},
+        "SyntaxUTF8String", HFILL }},
     { &hf_x509sat_SyntaxTeletexString_PDU,
-      { "TeletexString", "x509sat.TeletexString",
+      { "SyntaxTeletexString", "x509sat.SyntaxTeletexString",
         FT_STRING, BASE_NONE, NULL, 0,
-        "TeletexString", HFILL }},
+        "SyntaxTeletexString", HFILL }},
     { &hf_x509sat_SyntaxT61String_PDU,
-      { "T61String", "x509sat.T61String",
+      { "SyntaxT61String", "x509sat.SyntaxT61String",
         FT_STRING, BASE_NONE, NULL, 0,
-        "T61String", HFILL }},
+        "SyntaxT61String", HFILL }},
     { &hf_x509sat_SyntaxVideotexString_PDU,
-      { "VideotexString", "x509sat.VideotexString",
+      { "SyntaxVideotexString", "x509sat.SyntaxVideotexString",
         FT_STRING, BASE_NONE, NULL, 0,
-        "VideotexString", HFILL }},
+        "SyntaxVideotexString", HFILL }},
     { &hf_x509sat_SyntaxGraphicString_PDU,
-      { "GraphicString", "x509sat.GraphicString",
+      { "SyntaxGraphicString", "x509sat.SyntaxGraphicString",
         FT_STRING, BASE_NONE, NULL, 0,
-        "GraphicString", HFILL }},
+        "SyntaxGraphicString", HFILL }},
     { &hf_x509sat_SyntaxISO646String_PDU,
-      { "ISO646String", "x509sat.ISO646String",
+      { "SyntaxISO646String", "x509sat.SyntaxISO646String",
         FT_STRING, BASE_NONE, NULL, 0,
-        "ISO646String", HFILL }},
+        "SyntaxISO646String", HFILL }},
     { &hf_x509sat_SyntaxVisibleString_PDU,
-      { "VisibleString", "x509sat.VisibleString",
+      { "SyntaxVisibleString", "x509sat.SyntaxVisibleString",
         FT_STRING, BASE_NONE, NULL, 0,
-        "VisibleString", HFILL }},
+        "SyntaxVisibleString", HFILL }},
     { &hf_x509sat_SyntaxGeneralString_PDU,
-      { "GeneralString", "x509sat.GeneralString",
+      { "SyntaxGeneralString", "x509sat.SyntaxGeneralString",
         FT_STRING, BASE_NONE, NULL, 0,
-        "GeneralString", HFILL }},
+        "SyntaxGeneralString", HFILL }},
     { &hf_x509sat_teletexString,
       { "teletexString", "x509sat.teletexString",
         FT_STRING, BASE_NONE, NULL, 0,