fix problem with X.411 asn2wrs compilation, all dissectors regenerated

svn path=/trunk/; revision=26740
2008-11-10 13:36:24 +00:00 · 2008-11-10 13:36:24 +00:00 · 4726aec5b0
parent bfdccf3f9d
commit 4726aec5b0
13 changed files with 52 additions and 52 deletions
--- a/asn1/acp133/acp133.cnf
+++ b/asn1/acp133/acp133.cnf
@ -22,26 +22,26 @@ MonthlyUKMs
 RIParameters
 Kmid

-#.CLASS OBJECT-CLASS
-&Superclasses         ClassReference OBJECT-CLASS
-&kind                 
-&MandatoryAttributes  ClassReference ATTRIBUTE
-&OptionalAttributes   ClassReference ATTRIBUTE
-&id                   ObjectIdentifierType
-#.END
+##.CLASS OBJECT-CLASS
+#&Superclasses         ClassReference OBJECT-CLASS
+#&kind                 
+#&MandatoryAttributes  ClassReference ATTRIBUTE
+#&OptionalAttributes   ClassReference ATTRIBUTE
+#&id                   ObjectIdentifierType
+##.END

-#.CLASS ATTRIBUTE
-&derivation            ClassReference ATTRIBUTE
-&Type                  
-&equality-match        ClassReference MATCHING-RULE
-&ordering-match        ClassReference MATCHING-RULE
-&substrings-match      ClassReference MATCHING-RULE
-&single-valued         BooleanType
-&collective            BooleanType
-&no-user-modification  BooleanType
-&usage                 
-&id                    ObjectIdentifierType
-#.END
+##.CLASS ATTRIBUTE
+#&derivation            ClassReference ATTRIBUTE
+#&Type                  
+#&equality-match        ClassReference MATCHING-RULE
+#&ordering-match        ClassReference MATCHING-RULE
+#&substrings-match      ClassReference MATCHING-RULE
+#&single-valued         BooleanType
+#&collective            BooleanType
+#&no-user-modification  BooleanType
+#&usage                 
+#&id                    ObjectIdentifierType
+##.END

 #.CLASS MATCHING-RULE
 &ParentMatchingRules   ClassReference MATCHING-RULE
--- a/asn1/x411/x411.cnf
+++ b/asn1/x411/x411.cnf
@ -1,12 +1,12 @@
-#.TYPE_ATTR
-CountryName 	TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x411_CountryName_U_vals)  BITMASK = 0
-Time			TYPE = FT_STRING  DISPLAY = BASE_NONE  STRING = NULL BITMASK = 0
-
 #.IMPORT ../x509ce/x509ce-exp.cnf
 #.IMPORT ../x509if/x509if-exp.cnf
 #.IMPORT ../x509sat/x509sat-exp.cnf
 #.IMPORT ../x509af/x509af-exp.cnf

+#.TYPE_ATTR
+CountryName 	TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x411_CountryName_U_vals)  BITMASK = 0
+Time			TYPE = FT_STRING  DISPLAY = BASE_NONE  STRING = NULL BITMASK = 0
+
 #.OMIT_ASSIGNMENT
 # These gives unused code warnings
 MTAOriginatorRequestedAlternateRecipient
--- a/asn1/x509af/AuthenticationFramework.asn
+++ b/asn1/x509af/AuthenticationFramework.asn
@ -94,11 +94,11 @@ Extension ::= SEQUENCE {
 --ExtensionSet EXTENSION ::=
 --  {...}

--EXTENSION ::= CLASS {&id        OBJECT IDENTIFIER UNIQUE,
--                     &ExtnType  
--}WITH SYNTAX {SYNTAX &ExtnType
--              IDENTIFIED BY &id
--}
+EXTENSION ::= CLASS {&id        OBJECT IDENTIFIER UNIQUE,
+                     &ExtnType  
+}WITH SYNTAX {SYNTAX &ExtnType
+              IDENTIFIED BY &id
+}

 --  other certificate constructs
 Certificates ::= SEQUENCE {
--- a/asn1/x509af/x509af.cnf
+++ b/asn1/x509af/x509af.cnf
@ -7,7 +7,8 @@
 #.IMPORT ../x509if/x509if-exp.cnf
 #.IMPORT ../x509sat/x509sat-exp.cnf

-#.EXPORTS
+#.MODULE_EXPORTS
+EXTENSION
 ACPathData
 AlgorithmIdentifier
 AttCertValidityPeriod
@ -43,7 +44,6 @@ AttributeCertificate	B "2.5.4.58" "id-at-attributeCertificate"
 CertificateList			B "2.5.4.59" "id-at-attributeCertificateRevocationList"

 DSS-Params				B "1.2.840.10040.4.1" "id-dsa"
-#.NO_EMIT

 #.TYPE_RENAME
 AttributeCertificateInfo/subject	InfoSubject
--- a/asn1/x509ce/x509ce.cnf
+++ b/asn1/x509ce/x509ce.cnf
@ -18,18 +18,18 @@ MTSAbstractService	x411
 #.END

 # InformationFramework classes
-#.CLASS ATTRIBUTE
-&derivation            ClassReference ATTRIBUTE
-&Type                  
-&equality-match        ClassReference MATCHING-RULE
-&ordering-match        ClassReference MATCHING-RULE
-&substrings-match      ClassReference MATCHING-RULE
-&single-valued         BooleanType
-&collective            BooleanType
-&no-user-modification  BooleanType
-&usage                 
-&id                    ObjectIdentifierType
-#.END
+##.CLASS ATTRIBUTE
+#&derivation            ClassReference ATTRIBUTE
+#&Type                  
+#&equality-match        ClassReference MATCHING-RULE
+#&ordering-match        ClassReference MATCHING-RULE
+#&substrings-match      ClassReference MATCHING-RULE
+#&single-valued         BooleanType
+#&collective            BooleanType
+#&no-user-modification  BooleanType
+#&usage                 
+#&id                    ObjectIdentifierType
+##.END

 #.CLASS MATCHING-RULE
 &ParentMatchingRules   ClassReference MATCHING-RULE
--- a/asn1/x509sat/x509sat.cnf
+++ b/asn1/x509sat/x509sat.cnf
@ -35,7 +35,7 @@ MTSAbstractService x411
 &uniqueMatchIndicator  ClassReference ATTRIBUTE
 &id                    ObjectIdentifierType
 #.END
-#.EXPORTS
+#.MODULE_EXPORTS
 CaseIgnoreListMatch
 CountryName
 Criteria
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@ -1633,7 +1633,7 @@ void proto_register_cms(void) {
        "cms.MessageDigest", HFILL }},
    { &hf_cms_SigningTime_PDU,
      { "SigningTime", "cms.SigningTime",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(cms_Time_vals), 0,
        "cms.SigningTime", HFILL }},
    { &hf_cms_Countersignature_PDU,
      { "Countersignature", "cms.Countersignature",
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@ -5298,7 +5298,7 @@ void proto_register_dap(void) {
        "x509if.DistinguishedName", HFILL }},
    { &hf_dap_time,
      { "time", "dap.time",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(dap_Time_vals), 0,
        "dap.Time", HFILL }},
    { &hf_dap_random,
      { "random", "dap.random",
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@ -2376,7 +2376,7 @@ void proto_register_dop(void) {
        "dop.NULL", HFILL }},
    { &hf_dop_time,
      { "time", "dop.time",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
        "dop.Time", HFILL }},
    { &hf_dop_validUntil,
      { "validUntil", "dop.validUntil",
@ -2496,7 +2496,7 @@ void proto_register_dop(void) {
        "dop.TerminateRoleBInitiates", HFILL }},
    { &hf_dop_terminateAtTime,
      { "terminateAt", "dop.terminateAt",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
        "dop.Time", HFILL }},
    { &hf_dop_unsignedTerminateOperationalBindingArgument,
      { "unsignedTerminateOperationalBindingArgument", "dop.unsignedTerminateOperationalBindingArgument",
@ -2532,7 +2532,7 @@ void proto_register_dop(void) {
        "dop.T_agreementProposal", HFILL }},
    { &hf_dop_retryAt,
      { "retryAt", "dop.retryAt",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(dop_Time_vals), 0,
        "dop.Time", HFILL }},
    { &hf_dop_rdn,
      { "rdn", "dop.rdn",
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@ -2299,7 +2299,7 @@ void proto_register_dsp(void) {
        "dsp.DomainInfo", HFILL }},
    { &hf_dsp_timeLimit,
      { "timeLimit", "dsp.timeLimit",
-        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(dsp_Time_vals), 0,
        "dsp.Time", HFILL }},
    { &hf_dsp_entryOnly,
      { "entryOnly", "dsp.entryOnly",
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@ -752,7 +752,7 @@ void proto_register_ocsp(void) {
        "ocsp.Signature", HFILL }},
    { &hf_ocsp_version,
      { "version", "ocsp.version",
-        FT_INT32, BASE_DEC, VALS(x509af_Version_vals), 0,
+        FT_INT32, BASE_DEC, VALS(pkix1explicit_Version_vals), 0,
        "ocsp.Version", HFILL }},
    { &hf_ocsp_requestorName,
      { "requestorName", "ocsp.requestorName",
--- a/epan/dissectors/packet-pkcs1.c
+++ b/epan/dissectors/packet-pkcs1.c
@ -198,7 +198,7 @@ void proto_register_pkcs1(void) {
        "pkcs1.INTEGER", HFILL }},
    { &hf_pkcs1_version,
      { "version", "pkcs1.version",
-        FT_INT32, BASE_DEC, VALS(x509af_Version_vals), 0,
+        FT_INT32, BASE_DEC, NULL, 0,
        "pkcs1.Version", HFILL }},
    { &hf_pkcs1_privateExponent,
      { "privateExponent", "pkcs1.privateExponent",
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@ -1350,7 +1350,7 @@ void proto_register_pkcs12(void) {
        "pkcs12.T_attrValues_item", HFILL }},
    { &hf_pkcs12_privateKeyVersion,
      { "version", "pkcs12.version",
-        FT_INT32, BASE_DEC, VALS(x509af_Version_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(pkcs12_Version_vals), 0,
        "pkcs12.Version", HFILL }},
    { &hf_pkcs12_privateKeyAlgorithm,
      { "privateKeyAlgorithm", "pkcs12.privateKeyAlgorithm",