update asn2eth and all generated dissectors to new dissect_ber_boolean that takes...
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>
Wed, 23 Feb 2005 08:57:47 +0000 (08:57 -0000)
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>
Wed, 23 Feb 2005 08:57:47 +0000 (08:57 -0000)
svn path=/trunk/; revision=13479

34 files changed:
asn1/cms/cms-exp.cnf
asn1/pkixcrmf/crmf-exp.cnf
asn1/x509af/x509af-exp.cnf
asn1/x509ce/x509ce-exp.cnf
asn1/x509if/x509if-exp.cnf
asn1/x509sat/x509sat-exp.cnf
epan/dissectors/packet-ber.c
epan/dissectors/packet-ber.h
epan/dissectors/packet-cms.c
epan/dissectors/packet-cms.h
epan/dissectors/packet-crmf.c
epan/dissectors/packet-crmf.h
epan/dissectors/packet-gsm_map.c
epan/dissectors/packet-gsm_map.h
epan/dissectors/packet-h248.c
epan/dissectors/packet-h248.h
epan/dissectors/packet-inap.c
epan/dissectors/packet-kerberos.c
epan/dissectors/packet-ocsp.c
epan/dissectors/packet-pkcs1.c
epan/dissectors/packet-pkix1explicit.c
epan/dissectors/packet-pkix1explicit.h
epan/dissectors/packet-pkixqualified.c
epan/dissectors/packet-pkixtsp.c
epan/dissectors/packet-smrse.c
epan/dissectors/packet-x509af.c
epan/dissectors/packet-x509af.h
epan/dissectors/packet-x509ce.c
epan/dissectors/packet-x509ce.h
epan/dissectors/packet-x509if.c
epan/dissectors/packet-x509if.h
epan/dissectors/packet-x509sat.c
epan/dissectors/packet-x509sat.h
tools/asn2eth.py

index 4f84dfad4417aa691ceb8a37e9ec016dc06fb711..e9684292b37e0136d7489a053d9a34eb24217dda 100644 (file)
@@ -23,7 +23,7 @@ DigestAlgorithmIdentifiers TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL
 SignerInfos              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 EncapsulatedContentInfo  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SignerInfo               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-SignerIdentifier         TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(SignerIdentifier_vals)  BITMASK = 0
+SignerIdentifier         TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(cms_SignerIdentifier_vals)  BITMASK = 0
 SignedAttributes         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 UnsignedAttributes       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SignatureValue           TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
index 0a88e5fcb88c875ead48d48d66e3a697468c585f..00a432e1ef519b16a566eda4f60731102391a8c7 100644 (file)
@@ -36,19 +36,19 @@ CertTemplate             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL
 OptionalValidity         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 Controls                 TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 AttributeTypeAndValue    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ProofOfPossession        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(ProofOfPossession_vals)  BITMASK = 0
+ProofOfPossession        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(crmf_ProofOfPossession_vals)  BITMASK = 0
 POPOSigningKey           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 POPOSigningKeyInput      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 PKMACValue               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 PBMParameter             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-POPOPrivKey              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(POPOPrivKey_vals)  BITMASK = 0
-SubsequentMessage        TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = VALS(SubsequentMessage_vals)  BITMASK = 0
+POPOPrivKey              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(crmf_POPOPrivKey_vals)  BITMASK = 0
+SubsequentMessage        TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = VALS(crmf_SubsequentMessage_vals)  BITMASK = 0
 RegToken                 TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 Authenticator            TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 PKIPublicationInfo       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SinglePubInfo            TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-PKIArchiveOptions        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(PKIArchiveOptions_vals)  BITMASK = 0
-EncryptedKey             TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(EncryptedKey_vals)  BITMASK = 0
+PKIArchiveOptions        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(crmf_PKIArchiveOptions_vals)  BITMASK = 0
+EncryptedKey             TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(crmf_EncryptedKey_vals)  BITMASK = 0
 EncryptedValue           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 KeyGenParameters         TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
 OldCertId                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
index 5b898fa6de374e20877ca18768b63a039d1f697c..a084c0e585092c732515bff7026a15d139267fe9 100644 (file)
@@ -25,12 +25,12 @@ AttributeCertificateAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 
 #.TYPE_ATTR
 Certificate              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Version                  TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = VALS(Version_vals)  BITMASK = 0
+Version                  TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = VALS(x509af_Version_vals)  BITMASK = 0
 CertificateSerialNumber  TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 AlgorithmIdentifier      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 Validity                 TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SubjectPublicKeyInfo     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Time                     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(Time_vals)  BITMASK = 0
+Time                     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509af_Time_vals)  BITMASK = 0
 Extensions               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 Extension                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 Certificates             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
index aa51e8c79221b6aea693f511ae4d36608c05d3fd..a04a87efdfb613b390ae206b762364436532c38f 100644 (file)
@@ -66,7 +66,7 @@ PolicyInformation        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL
 PolicyQualifierInfo      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 PolicyMappingsSyntax     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 GeneralNames             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-GeneralName              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(GeneralName_vals)  BITMASK = 0
+GeneralName              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_GeneralName_vals)  BITMASK = 0
 EDIPartyName             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 AttributesSyntax         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 BasicConstraintsSyntax   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
@@ -77,7 +77,7 @@ BaseDistance             TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL
 PolicyConstraintsSyntax  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SkipCerts                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 CRLNumber                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-CRLReason                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(CRLReason_vals)  BITMASK = 0
+CRLReason                TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_CRLReason_vals)  BITMASK = 0
 HoldInstruction          TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CRLScopeSyntax           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 PerAuthorityScope        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
@@ -85,21 +85,21 @@ OnlyCertificateTypes     TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL
 NumberRange              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 BaseRevocationInfo       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 StatusReferrals          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-StatusReferral           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(StatusReferral_vals)  BITMASK = 0
+StatusReferral           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_StatusReferral_vals)  BITMASK = 0
 CRLReferral              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 DeltaRefInfo             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CRLStreamIdentifier      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-OrderedListSyntax        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(OrderedListSyntax_vals)  BITMASK = 0
+OrderedListSyntax        TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_OrderedListSyntax_vals)  BITMASK = 0
 DeltaInformation         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CRLDistPointsSyntax      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 DistributionPoint        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-DistributionPointName    TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(DistributionPointName_vals)  BITMASK = 0
+DistributionPointName    TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_DistributionPointName_vals)  BITMASK = 0
 ReasonFlags              TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
 IssuingDistPointSyntax   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 BaseCRLNumber            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 CertificateExactAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CertificateAssertion     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AltNameType              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(AltNameType_vals)  BITMASK = 0
+AltNameType              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509ce_AltNameType_vals)  BITMASK = 0
 CertPolicySet            TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CertificatePairExactAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 CertificatePairAssertion TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
index 448036073a94a297121f7bab1e47c47de5bb5433..fdef6c2a8702689a1bc46bd4f7fbae167f5475e1 100644 (file)
@@ -47,7 +47,7 @@ Context                  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL
 AttributeValueAssertion  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 ContextAssertion         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 AttributeTypeAssertion   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Name                     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(Name_vals)  BITMASK = 0
+Name                     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_Name_vals)  BITMASK = 0
 RDNSequence              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 DistinguishedName        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 RelativeDistinguishedName TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
@@ -56,8 +56,8 @@ SubtreeSpecification     TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL
 LocalName                TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 ChopSpecification        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 BaseDistance             TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-Refinement               TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(Refinement_vals)  BITMASK = 0
-AttributeUsage           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(AttributeUsage_vals)  BITMASK = 0
+Refinement               TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_Refinement_vals)  BITMASK = 0
+AttributeUsage           TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_AttributeUsage_vals)  BITMASK = 0
 DITStructureRule         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 RuleIdentifier           TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
 DITContentRule           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
@@ -66,14 +66,14 @@ SearchRuleDescription    TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL
 SearchRule               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 SearchRuleId             TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 AllowedSubset            TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
-ImposedSubset            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(ImposedSubset_vals)  BITMASK = 0
+ImposedSubset            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_ImposedSubset_vals)  BITMASK = 0
 RequestAttribute         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 ContextProfile           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ContextCombination       TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(ContextCombination_vals)  BITMASK = 0
+ContextCombination       TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_ContextCombination_vals)  BITMASK = 0
 MatchingUse              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-AttributeCombination     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(AttributeCombination_vals)  BITMASK = 0
+AttributeCombination     TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_AttributeCombination_vals)  BITMASK = 0
 ResultAttribute          TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-OutputValues             TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(OutputValues_vals)  BITMASK = 0
+OutputValues             TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509if_OutputValues_vals)  BITMASK = 0
 ControlOptions           TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 EntryLimit               TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 RelaxationPolicy         TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
index 05e01b04b9dbd4fcbcd82da1195cbf219194223e..7ba9aad802e986c6536f5c164ec16d5b48f3df9a 100644 (file)
@@ -35,7 +35,7 @@ LocaleContextSyntax      BER_CLASS_UNI -1/*choice*/
 DirectoryString          TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 UniqueIdentifier         TYPE = FT_BYTES   DISPLAY = BASE_HEX   STRINGS = NULL  BITMASK = 0
 CountryName              TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-Criteria                 TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(Criteria_vals)  BITMASK = 0
+Criteria                 TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_Criteria_vals)  BITMASK = 0
 EnhancedGuide            TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 PostalAddress            TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 FacsimileTelephoneNumber TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
@@ -51,16 +51,16 @@ SubstringAssertion       TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL
 CaseIgnoreListMatch      TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 OctetSubstringAssertion  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 ZonalSelect              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-ZonalResult              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(ZonalResult_vals)  BITMASK = 0
+ZonalResult              TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_ZonalResult_vals)  BITMASK = 0
 LanguageContextSyntax    TYPE = FT_STRING  DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 TimeSpecification        TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 Period                   TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
-XDayOf                   TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(XDayOf_vals)  BITMASK = 0
-NamedDay                 TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(NamedDay_vals)  BITMASK = 0
+XDayOf                   TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_XDayOf_vals)  BITMASK = 0
+NamedDay                 TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_NamedDay_vals)  BITMASK = 0
 DayTimeBand              TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 DayTime                  TYPE = FT_NONE    DISPLAY = BASE_NONE  STRINGS = NULL  BITMASK = 0
 TimeZone                 TYPE = FT_INT32   DISPLAY = BASE_DEC   STRINGS = NULL  BITMASK = 0
-TimeAssertion            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(TimeAssertion_vals)  BITMASK = 0
-LocaleContextSyntax      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(LocaleContextSyntax_vals)  BITMASK = 0
+TimeAssertion            TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_TimeAssertion_vals)  BITMASK = 0
+LocaleContextSyntax      TYPE = FT_UINT32  DISPLAY = BASE_DEC   STRINGS = VALS(x509sat_LocaleContextSyntax_vals)  BITMASK = 0
 #.END
 
index 1caa46b2fd30908c95d30253ecf075b42e4597c2..0915965c1057d6cf868dd60638c9e6a8d1966bf7 100644 (file)
@@ -593,7 +593,7 @@ printf("INTEGERnew dissect_ber_integer(%s) entered implicit_tag:%d len:%d\n",nam
 
 
 int
-dissect_ber_boolean(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id)
+dissect_ber_boolean(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id)
 {
        guint8 class;
        gboolean pc;
@@ -602,10 +602,13 @@ dissect_ber_boolean(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int off
        guint8 val;
        header_field_info *hfi;
 
-       offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
-       offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
-
-/*     if(class!=BER_CLASS_UNI)*/
+       if(!implicit_tag){
+               offset=dissect_ber_identifier(pinfo, tree, tvb, offset, &class, &pc, &tag);
+               offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
+               /*if(class!=BER_CLASS_UNI)*/
+       } else {
+               /* nothing to do here, yet */
+       }
        
        val=tvb_get_guint8(tvb, offset);
        offset+=1;
index caa7a8baf8bf0032d7ba29d730e28605e15d747a..a15264056ac33cbf7f5148394524727f9511ad15 100644 (file)
@@ -89,7 +89,7 @@ extern int dissect_ber_octet_string_wcb(gboolean implicit_tag, packet_info *pinf
 extern int dissect_ber_integer(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id, guint32 *value);
 
 
-extern int dissect_ber_boolean(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
+extern int dissect_ber_boolean(gboolean implicit_tag, packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset, gint hf_id);
 
 
 #define BER_FLAGS_OPTIONAL     0x00000001
index f9ba9d2323ce3d3d486a27e6bbd8188362955fc2..4ddf020514e9dd76fd04be121d6877221ae0c5c3 100644 (file)
@@ -265,7 +265,7 @@ dissect_cms_ContentInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, pa
 }
 
 
-static const value_string CMSVersion_vals[] = {
+static const value_string cms_CMSVersion_vals[] = {
   {   0, "v0" },
   {   1, "v1" },
   {   2, "v2" },
@@ -488,7 +488,7 @@ static int dissect_extendedCertificate_impl(packet_info *pinfo, proto_tree *tree
 }
 
 
-static const value_string CertificateChoices_vals[] = {
+static const value_string cms_CertificateChoices_vals[] = {
   {   0, "certificate" },
   {   1, "extendedCertificate" },
   {   2, "attrCert" },
@@ -579,7 +579,7 @@ static int dissect_subjectKeyIdentifier_impl(packet_info *pinfo, proto_tree *tre
 }
 
 
-const value_string SignerIdentifier_vals[] = {
+const value_string cms_SignerIdentifier_vals[] = {
   {   0, "issuerAndSerialNumber" },
   {   1, "subjectKeyIdentifier" },
   { 0, NULL }
@@ -717,7 +717,7 @@ static int dissect_originatorInfo_impl(packet_info *pinfo, proto_tree *tree, tvb
 }
 
 
-static const value_string RecipientIdentifier_vals[] = {
+static const value_string cms_RecipientIdentifier_vals[] = {
   {   0, "issuerAndSerialNumber" },
   {   1, "subjectKeyIdentifier" },
   { 0, NULL }
@@ -813,7 +813,7 @@ static int dissect_originatorKey_impl(packet_info *pinfo, proto_tree *tree, tvbu
 }
 
 
-static const value_string OriginatorIdentifierOrKey_vals[] = {
+static const value_string cms_OriginatorIdentifierOrKey_vals[] = {
   {   0, "issuerAndSerialNumber" },
   {   1, "subjectKeyIdentifier" },
   {   2, "originatorKey" },
@@ -923,7 +923,7 @@ static int dissect_rKeyId_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 }
 
 
-static const value_string KeyAgreeRecipientIdentifier_vals[] = {
+static const value_string cms_KeyAgreeRecipientIdentifier_vals[] = {
   {   0, "issuerAndSerialNumber" },
   {   1, "rKeyId" },
   { 0, NULL }
@@ -1048,7 +1048,7 @@ static int dissect_kekri_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
 }
 
 
-static const value_string RecipientInfo_vals[] = {
+static const value_string cms_RecipientInfo_vals[] = {
   {   0, "ktri" },
   {   1, "kari" },
   {   2, "kekri" },
@@ -1336,7 +1336,7 @@ void proto_register_cms(void) {
         "ContentInfo/content", HFILL }},
     { &hf_cms_version,
       { "version", "cms.version",
-        FT_INT32, BASE_DEC, VALS(CMSVersion_vals), 0,
+        FT_INT32, BASE_DEC, VALS(cms_CMSVersion_vals), 0,
         "", HFILL }},
     { &hf_cms_digestAlgorithms,
       { "digestAlgorithms", "cms.digestAlgorithms",
@@ -1376,7 +1376,7 @@ void proto_register_cms(void) {
         "EncapsulatedContentInfo/eContent", HFILL }},
     { &hf_cms_sid,
       { "sid", "cms.sid",
-        FT_UINT32, BASE_DEC, VALS(SignerIdentifier_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(cms_SignerIdentifier_vals), 0,
         "SignerInfo/sid", HFILL }},
     { &hf_cms_digestAlgorithm,
       { "digestAlgorithm", "cms.digestAlgorithm",
@@ -1440,7 +1440,7 @@ void proto_register_cms(void) {
         "OriginatorInfo/certs", HFILL }},
     { &hf_cms_RecipientInfos_item,
       { "Item", "cms.RecipientInfos_item",
-        FT_UINT32, BASE_DEC, VALS(RecipientInfo_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(cms_RecipientInfo_vals), 0,
         "RecipientInfos/_item", HFILL }},
     { &hf_cms_contentType1,
       { "contentType", "cms.contentType",
@@ -1472,7 +1472,7 @@ void proto_register_cms(void) {
         "RecipientInfo/kekri", HFILL }},
     { &hf_cms_rid,
       { "rid", "cms.rid",
-        FT_UINT32, BASE_DEC, VALS(RecipientIdentifier_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(cms_RecipientIdentifier_vals), 0,
         "KeyTransRecipientInfo/rid", HFILL }},
     { &hf_cms_keyEncryptionAlgorithm,
       { "keyEncryptionAlgorithm", "cms.keyEncryptionAlgorithm",
@@ -1484,7 +1484,7 @@ void proto_register_cms(void) {
         "", HFILL }},
     { &hf_cms_originator,
       { "originator", "cms.originator",
-        FT_UINT32, BASE_DEC, VALS(OriginatorIdentifierOrKey_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(cms_OriginatorIdentifierOrKey_vals), 0,
         "KeyAgreeRecipientInfo/originator", HFILL }},
     { &hf_cms_ukm,
       { "ukm", "cms.ukm",
@@ -1512,7 +1512,7 @@ void proto_register_cms(void) {
         "RecipientEncryptedKeys/_item", HFILL }},
     { &hf_cms_rekRid,
       { "rid", "cms.rid",
-        FT_UINT32, BASE_DEC, VALS(KeyAgreeRecipientIdentifier_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(cms_KeyAgreeRecipientIdentifier_vals), 0,
         "RecipientEncryptedKey/rid", HFILL }},
     { &hf_cms_rKeyId,
       { "rKeyId", "cms.rKeyId",
@@ -1580,11 +1580,11 @@ void proto_register_cms(void) {
         "CertificateChoices/attrCert", HFILL }},
     { &hf_cms_CertificateSet_item,
       { "Item", "cms.CertificateSet_item",
-        FT_UINT32, BASE_DEC, VALS(CertificateChoices_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(cms_CertificateChoices_vals), 0,
         "CertificateSet/_item", HFILL }},
     { &hf_cms_issuer,
       { "issuer", "cms.issuer",
-        FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "IssuerAndSerialNumber/issuer", HFILL }},
     { &hf_cms_serialNumber,
       { "serialNumber", "cms.serialNumber",
index ab38bf3a35f2ba62b7118a85cf62225bb6b6cf0d..1cac89ea08f6014ee5fc6bec61a6c2acfd4efa49 100644 (file)
@@ -36,7 +36,7 @@
 
 /*--- Included file: packet-cms-exp.h ---*/
 
-extern const value_string SignerIdentifier_vals[];
+extern const value_string cms_SignerIdentifier_vals[];
 int dissect_cms_ContentInfo(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_cms_ContentType(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_cms_SignedData(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
index 85c0b323487c81644617ae5ad2a7b2be34dbe935..6c1a04774149b57bc99e1c1657d32193052c635f 100644 (file)
@@ -62,7 +62,7 @@ static int hf_crmf_generalTime = -1;              /* GeneralizedTime */
 static int hf_crmf_CertReqMessages_item = -1;     /* CertReqMsg */
 static int hf_crmf_certReq = -1;                  /* CertRequest */
 static int hf_crmf_pop = -1;                      /* ProofOfPossession */
-static int hf_crmf_regInfo = -1;                  /* SEQUNCE_SIZE_1_MAX_OF_AttributeTypeAndValue */
+static int hf_crmf_regInfo = -1;                  /* SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue */
 static int hf_crmf_regInfo_item = -1;             /* AttributeTypeAndValue */
 static int hf_crmf_certReqId = -1;                /* INTEGER */
 static int hf_crmf_certTemplate = -1;             /* CertTemplate */
@@ -102,7 +102,7 @@ static int hf_crmf_thisMessage = -1;              /* BIT_STRING */
 static int hf_crmf_subsequentMessage = -1;        /* SubsequentMessage */
 static int hf_crmf_dhMAC = -1;                    /* BIT_STRING */
 static int hf_crmf_action = -1;                   /* T_action */
-static int hf_crmf_pubInfos = -1;                 /* SEQUNCE_SIZE_1_MAX_OF_SinglePubInfo */
+static int hf_crmf_pubInfos = -1;                 /* SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo */
 static int hf_crmf_pubInfos_item = -1;            /* SinglePubInfo */
 static int hf_crmf_pubMethod = -1;                /* T_pubMethod */
 static int hf_crmf_pubLocation = -1;              /* GeneralName */
@@ -129,7 +129,7 @@ static int hf_crmf_issuer = -1;                   /* GeneralName */
 static gint ett_crmf_Time = -1;
 static gint ett_crmf_CertReqMessages = -1;
 static gint ett_crmf_CertReqMsg = -1;
-static gint ett_crmf_SEQUNCE_SIZE_1_MAX_OF_AttributeTypeAndValue = -1;
+static gint ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue = -1;
 static gint ett_crmf_CertRequest = -1;
 static gint ett_crmf_CertTemplate = -1;
 static gint ett_crmf_OptionalValidity = -1;
@@ -143,7 +143,7 @@ static gint ett_crmf_PKMACValue = -1;
 static gint ett_crmf_PBMParameter = -1;
 static gint ett_crmf_POPOPrivKey = -1;
 static gint ett_crmf_PKIPublicationInfo = -1;
-static gint ett_crmf_SEQUNCE_SIZE_1_MAX_OF_SinglePubInfo = -1;
+static gint ett_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo = -1;
 static gint ett_crmf_SinglePubInfo = -1;
 static gint ett_crmf_PKIArchiveOptions = -1;
 static gint ett_crmf_EncryptedKey = -1;
@@ -213,7 +213,7 @@ static int dissect_issuer(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 }
 
 
-static const value_string Version_vals[] = {
+static const value_string crmf_Version_vals[] = {
   {   0, "v1" },
   {   1, "v2" },
   {   2, "v3" },
@@ -272,7 +272,7 @@ static int dissect_generalTime(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 }
 
 
-static const value_string Time_vals[] = {
+static const value_string crmf_Time_vals[] = {
   {   0, "utcTime" },
   {   1, "generalTime" },
   { 0, NULL }
@@ -500,7 +500,7 @@ static int dissect_publicKeyMAC(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 }
 
 
-static const value_string T_authInfo_vals[] = {
+static const value_string crmf_T_authInfo_vals[] = {
   {   0, "sender" },
   {   1, "publicKeyMAC" },
   { 0, NULL }
@@ -559,7 +559,7 @@ static int dissect_signature_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
 }
 
 
-const value_string SubsequentMessage_vals[] = {
+const value_string crmf_SubsequentMessage_vals[] = {
   {   0, "encrCert" },
   {   1, "challengeResp" },
   { 0, NULL }
@@ -577,7 +577,7 @@ static int dissect_subsequentMessage_impl(packet_info *pinfo, proto_tree *tree,
 }
 
 
-const value_string POPOPrivKey_vals[] = {
+const value_string crmf_POPOPrivKey_vals[] = {
   {   0, "thisMessage" },
   {   1, "subsequentMessage" },
   {   2, "dhMAC" },
@@ -606,7 +606,7 @@ static int dissect_keyAgreement_impl(packet_info *pinfo, proto_tree *tree, tvbuf
 }
 
 
-const value_string ProofOfPossession_vals[] = {
+const value_string crmf_ProofOfPossession_vals[] = {
   {   0, "raVerified" },
   {   1, "signature" },
   {   2, "keyEncipherment" },
@@ -633,19 +633,19 @@ static int dissect_pop(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
   return dissect_crmf_ProofOfPossession(FALSE, tvb, offset, pinfo, tree, hf_crmf_pop);
 }
 
-static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_regInfo_item },
 };
 
 static int
-dissect_crmf_SEQUNCE_SIZE_1_MAX_OF_AttributeTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of, hf_index, ett_crmf_SEQUNCE_SIZE_1_MAX_OF_AttributeTypeAndValue);
+                                   SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue);
 
   return offset;
 }
 static int dissect_regInfo(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_crmf_SEQUNCE_SIZE_1_MAX_OF_AttributeTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_crmf_regInfo);
+  return dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue(FALSE, tvb, offset, pinfo, tree, hf_crmf_regInfo);
 }
 
 static const ber_sequence_t CertReqMsg_sequence[] = {
@@ -730,7 +730,7 @@ dissect_crmf_Authenticator(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset,
 }
 
 
-static const value_string T_action_vals[] = {
+static const value_string crmf_T_action_vals[] = {
   {   0, "dontPublish" },
   {   1, "pleasePublish" },
   { 0, NULL }
@@ -748,7 +748,7 @@ static int dissect_action(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 }
 
 
-static const value_string T_pubMethod_vals[] = {
+static const value_string crmf_T_pubMethod_vals[] = {
   {   0, "dontCare" },
   {   1, "x500" },
   {   2, "web" },
@@ -784,19 +784,19 @@ static int dissect_pubInfos_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_crmf_SinglePubInfo(FALSE, tvb, offset, pinfo, tree, hf_crmf_pubInfos_item);
 }
 
-static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_pubInfos_item },
 };
 
 static int
-dissect_crmf_SEQUNCE_SIZE_1_MAX_OF_SinglePubInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of, hf_index, ett_crmf_SEQUNCE_SIZE_1_MAX_OF_SinglePubInfo);
+                                   SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo_sequence_of, hf_index, ett_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo);
 
   return offset;
 }
 static int dissect_pubInfos(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_crmf_SEQUNCE_SIZE_1_MAX_OF_SinglePubInfo(FALSE, tvb, offset, pinfo, tree, hf_crmf_pubInfos);
+  return dissect_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo(FALSE, tvb, offset, pinfo, tree, hf_crmf_pubInfos);
 }
 
 static const ber_sequence_t PKIPublicationInfo_sequence[] = {
@@ -835,7 +835,7 @@ static int dissect_encryptedValue(packet_info *pinfo, proto_tree *tree, tvbuff_t
 }
 
 
-const value_string EncryptedKey_vals[] = {
+const value_string crmf_EncryptedKey_vals[] = {
   {   0, "encryptedValue" },
   {   1, "envelopedData" },
   { 0, NULL }
@@ -873,7 +873,7 @@ static int dissect_keyGenParameters_impl(packet_info *pinfo, proto_tree *tree, t
 
 static int
 dissect_crmf_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
 
   return offset;
 }
@@ -882,7 +882,7 @@ static int dissect_archiveRemGenPrivKey_impl(packet_info *pinfo, proto_tree *tre
 }
 
 
-const value_string PKIArchiveOptions_vals[] = {
+const value_string crmf_PKIArchiveOptions_vals[] = {
   {   0, "encryptedPrivKey" },
   {   1, "keyGenParameters" },
   {   2, "archiveRemGenPrivKey" },
@@ -987,7 +987,7 @@ void proto_register_crmf(void) {
         "CertReqMsg/certReq", HFILL }},
     { &hf_crmf_pop,
       { "pop", "crmf.pop",
-        FT_UINT32, BASE_DEC, VALS(ProofOfPossession_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(crmf_ProofOfPossession_vals), 0,
         "CertReqMsg/pop", HFILL }},
     { &hf_crmf_regInfo,
       { "regInfo", "crmf.regInfo",
@@ -1011,7 +1011,7 @@ void proto_register_crmf(void) {
         "CertRequest/controls", HFILL }},
     { &hf_crmf_version,
       { "version", "crmf.version",
-        FT_INT32, BASE_DEC, VALS(Version_vals), 0,
+        FT_INT32, BASE_DEC, VALS(crmf_Version_vals), 0,
         "CertTemplate/version", HFILL }},
     { &hf_crmf_serialNumber,
       { "serialNumber", "crmf.serialNumber",
@@ -1051,11 +1051,11 @@ void proto_register_crmf(void) {
         "CertTemplate/extensions", HFILL }},
     { &hf_crmf_notBefore,
       { "notBefore", "crmf.notBefore",
-        FT_UINT32, BASE_DEC, VALS(Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(crmf_Time_vals), 0,
         "OptionalValidity/notBefore", HFILL }},
     { &hf_crmf_notAfter,
       { "notAfter", "crmf.notAfter",
-        FT_UINT32, BASE_DEC, VALS(Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(crmf_Time_vals), 0,
         "OptionalValidity/notAfter", HFILL }},
     { &hf_crmf_Controls_item,
       { "Item", "crmf.Controls_item",
@@ -1079,11 +1079,11 @@ void proto_register_crmf(void) {
         "ProofOfPossession/signature", HFILL }},
     { &hf_crmf_keyEncipherment,
       { "keyEncipherment", "crmf.keyEncipherment",
-        FT_UINT32, BASE_DEC, VALS(POPOPrivKey_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(crmf_POPOPrivKey_vals), 0,
         "ProofOfPossession/keyEncipherment", HFILL }},
     { &hf_crmf_keyAgreement,
       { "keyAgreement", "crmf.keyAgreement",
-        FT_UINT32, BASE_DEC, VALS(POPOPrivKey_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(crmf_POPOPrivKey_vals), 0,
         "ProofOfPossession/keyAgreement", HFILL }},
     { &hf_crmf_poposkInput,
       { "poposkInput", "crmf.poposkInput",
@@ -1099,7 +1099,7 @@ void proto_register_crmf(void) {
         "POPOSigningKey/signature", HFILL }},
     { &hf_crmf_authInfo,
       { "authInfo", "crmf.authInfo",
-        FT_UINT32, BASE_DEC, VALS(T_authInfo_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(crmf_T_authInfo_vals), 0,
         "POPOSigningKeyInput/authInfo", HFILL }},
     { &hf_crmf_sender,
       { "sender", "crmf.sender",
@@ -1139,7 +1139,7 @@ void proto_register_crmf(void) {
         "POPOPrivKey/thisMessage", HFILL }},
     { &hf_crmf_subsequentMessage,
       { "subsequentMessage", "crmf.subsequentMessage",
-        FT_INT32, BASE_DEC, VALS(SubsequentMessage_vals), 0,
+        FT_INT32, BASE_DEC, VALS(crmf_SubsequentMessage_vals), 0,
         "POPOPrivKey/subsequentMessage", HFILL }},
     { &hf_crmf_dhMAC,
       { "dhMAC", "crmf.dhMAC",
@@ -1147,7 +1147,7 @@ void proto_register_crmf(void) {
         "POPOPrivKey/dhMAC", HFILL }},
     { &hf_crmf_action,
       { "action", "crmf.action",
-        FT_INT32, BASE_DEC, VALS(T_action_vals), 0,
+        FT_INT32, BASE_DEC, VALS(crmf_T_action_vals), 0,
         "PKIPublicationInfo/action", HFILL }},
     { &hf_crmf_pubInfos,
       { "pubInfos", "crmf.pubInfos",
@@ -1159,7 +1159,7 @@ void proto_register_crmf(void) {
         "PKIPublicationInfo/pubInfos/_item", HFILL }},
     { &hf_crmf_pubMethod,
       { "pubMethod", "crmf.pubMethod",
-        FT_INT32, BASE_DEC, VALS(T_pubMethod_vals), 0,
+        FT_INT32, BASE_DEC, VALS(crmf_T_pubMethod_vals), 0,
         "SinglePubInfo/pubMethod", HFILL }},
     { &hf_crmf_pubLocation,
       { "pubLocation", "crmf.pubLocation",
@@ -1167,7 +1167,7 @@ void proto_register_crmf(void) {
         "SinglePubInfo/pubLocation", HFILL }},
     { &hf_crmf_encryptedPrivKey,
       { "encryptedPrivKey", "crmf.encryptedPrivKey",
-        FT_UINT32, BASE_DEC, VALS(EncryptedKey_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(crmf_EncryptedKey_vals), 0,
         "PKIArchiveOptions/encryptedPrivKey", HFILL }},
     { &hf_crmf_keyGenParameters,
       { "keyGenParameters", "crmf.keyGenParameters",
@@ -1226,7 +1226,7 @@ void proto_register_crmf(void) {
     &ett_crmf_Time,
     &ett_crmf_CertReqMessages,
     &ett_crmf_CertReqMsg,
-    &ett_crmf_SEQUNCE_SIZE_1_MAX_OF_AttributeTypeAndValue,
+    &ett_crmf_SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue,
     &ett_crmf_CertRequest,
     &ett_crmf_CertTemplate,
     &ett_crmf_OptionalValidity,
@@ -1240,7 +1240,7 @@ void proto_register_crmf(void) {
     &ett_crmf_PBMParameter,
     &ett_crmf_POPOPrivKey,
     &ett_crmf_PKIPublicationInfo,
-    &ett_crmf_SEQUNCE_SIZE_1_MAX_OF_SinglePubInfo,
+    &ett_crmf_SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo,
     &ett_crmf_SinglePubInfo,
     &ett_crmf_PKIArchiveOptions,
     &ett_crmf_EncryptedKey,
index b88e17c27fad512c995f1a4f27c2f1ee5e59dd43..0f97f4853509fcd3e324c712322f932f3cb6c93d 100644 (file)
 
 /*--- Included file: packet-crmf-exp.h ---*/
 
-extern const value_string ProofOfPossession_vals[];
-extern const value_string POPOPrivKey_vals[];
-extern const value_string SubsequentMessage_vals[];
-extern const value_string PKIArchiveOptions_vals[];
-extern const value_string EncryptedKey_vals[];
+extern const value_string crmf_ProofOfPossession_vals[];
+extern const value_string crmf_POPOPrivKey_vals[];
+extern const value_string crmf_SubsequentMessage_vals[];
+extern const value_string crmf_PKIArchiveOptions_vals[];
+extern const value_string crmf_EncryptedKey_vals[];
 int dissect_crmf_CertReqMessages(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_crmf_CertReqMsg(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_crmf_CertRequest(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
index b9ddf58ea34374980f87fe53478e253a65b648ad..41271876c886a4e977d1d6849207fd3354f59cc8 100644 (file)
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-gsm_map.c                                                         */
+/* ./packet-gsm_map.c                                                         */
 /* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */
 
 /* Input file: packet-gsm_map-template.c */
@@ -505,7 +505,7 @@ static int hf_gsm_map_locationInformationFlag = -1;  /* NULL */
 static int hf_gsm_map_subscriberStateFlag = -1;   /* NULL */
 static int hf_gsm_map_currentLocation = -1;       /* NULL */
 static int hf_gsm_map_requestedDomain = -1;       /* T_requestedDomain */
-static int hf_gsm_map_imei1 = -1;                 /* NULL */
+static int hf_gsm_map_imei_flg = -1;              /* NULL */
 static int hf_gsm_map_ms_classmark = -1;          /* NULL */
 static int hf_gsm_map_mnpRequestedInfo = -1;      /* NULL */
 static int hf_gsm_map_subscriberIdentity = -1;    /* SubscriberIdentity */
@@ -1657,8 +1657,8 @@ static int dissect_subscriberStateFlag_impl(packet_info *pinfo, proto_tree *tree
 static int dissect_currentLocation_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
   return dissect_gsm_map_NULL(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_currentLocation);
 }
-static int dissect_imei1_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_gsm_map_NULL(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_imei1);
+static int dissect_imei_flg_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_gsm_map_NULL(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_imei_flg);
 }
 static int dissect_ms_classmark_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
   return dissect_gsm_map_NULL(TRUE, tvb, offset, pinfo, tree, hf_gsm_map_ms_classmark);
@@ -7077,7 +7077,7 @@ dissect_gsm_map_EraseCC_EntryRes(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
 
 static int
 dissect_gsm_map_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
 
   return offset;
 }
@@ -7563,7 +7563,7 @@ static const ber_sequence_t RequestedInfo_sequence[] = {
   { BER_CLASS_CON, 2, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_extensionContainer_impl },
   { BER_CLASS_CON, 3, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_currentLocation_impl },
   { BER_CLASS_CON, 4, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_requestedDomain_impl },
-  { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imei1_impl },
+  { BER_CLASS_CON, 6, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_imei_flg_impl },
   { BER_CLASS_CON, 5, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ms_classmark_impl },
   { BER_CLASS_CON, 7, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_mnpRequestedInfo_impl },
   { 0, 0, 0, NULL }
@@ -13358,7 +13358,7 @@ void proto_register_gsm_map(void) {
       { "requestedDomain", "gsm_map.requestedDomain",
         FT_UINT32, BASE_DEC, VALS(gsm_map_T_requestedDomain_vals), 0,
         "RequestedInfo/requestedDomain", HFILL }},
-    { &hf_gsm_map_imei1,
+    { &hf_gsm_map_imei_flg,
       { "imei", "gsm_map.imei",
         FT_NONE, BASE_NONE, NULL, 0,
         "RequestedInfo/imei", HFILL }},
index 751608d693963b2b435e8eb566bc5f979f60e708..88b0583c2c3fedca7e4ff1405effe217b1a348fc 100644 (file)
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-gsm_map.h                                                         */
+/* ./packet-gsm_map.h                                                         */
 /* ../../tools/asn2eth.py -X -b -e -p gsm_map -c gsmmap.cnf -s packet-gsm_map-template GSMMAP.asn */
 
 /* Input file: packet-gsm_map-template.h */
index e5b857e7dd7a27effecc58458bff9fc7d8b60bcc..d354b83d52982e2cd3ed40fae59b5d8c823feab0 100644 (file)
@@ -1,6 +1,6 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
-/* .\packet-h248.c                                                            */
+/* ./packet-h248.c                                                            */
 /* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */
 
 /* Input file: packet-h248-template.c */
@@ -1320,7 +1320,7 @@ static int dissect_priority_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_h248_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
 
   return offset;
 }
index e3abab06c1d35838fb821d85ec811c50d222593d..84099c67df859ae2b4fb05cd89027f7eb61d0f14 100644 (file)
@@ -1,39 +1,39 @@
-/* Do not modify this file.                                                   */\r
-/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */\r
-/* .\packet-h248.h                                                            */\r
-/* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */\r
-\r
-/* Input file: packet-h248-template.h */\r
-\r
-/* packet-h248.h\r
- * Routines for H.248/MEGACO packet dissection\r
- * Ronnie Sahlberg 2004\r
- *\r
- * $Id$\r
- *\r
- * Ethereal - Network traffic analyzer\r
- * By Gerald Combs <gerald@ethereal.com>\r
- * Copyright 1998 Gerald Combs\r
- *\r
- * This program is free software; you can redistribute it and/or\r
- * modify it under the terms of the GNU General Public License\r
- * as published by the Free Software Foundation; either version 2\r
- * of the License, or (at your option) any later version.\r
- *\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.\r
- */\r
-\r
-#ifndef PACKET_H248_H\r
-#define PACKET_H248_H\r
-\r
-/*#include "packet-h248-exp.h"*/\r
-\r
-#endif  /* PACKET_H248_H */\r
-\r
+/* Do not modify this file.                                                   */
+/* It is created automatically by the ASN.1 to Ethereal dissector compiler    */
+/* ./packet-h248.h                                                            */
+/* ../../tools/asn2eth.py -X -b -e -p h248 -c h248.cnf -s packet-h248-template MEGACO.asn */
+
+/* Input file: packet-h248-template.h */
+
+/* packet-h248.h
+ * Routines for H.248/MEGACO packet dissection
+ * Ronnie Sahlberg 2004
+ *
+ * $Id: packet-h248-template.h 12203 2004-10-05 09:18:55Z guy $
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef PACKET_H248_H
+#define PACKET_H248_H
+
+/*#include "packet-h248-exp.h"*/
+
+#endif  /* PACKET_H248_H */
+
index 9d23637801ba29a46787aeae1aa3fc4f7ab4e86a..a1707680d982ae13d83331654d24a468a709ff5c 100644 (file)
@@ -3070,7 +3070,7 @@ dissect_inap_OriginationAttemptAuthorized(gboolean implicit_tag _U_, tvbuff_t *t
 
 static int
 dissect_inap_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
 
   return offset;
 }
index bab8577bd7150fdc35428956f323e2877731fd63..81015e056ea2cb2ab3bf7b27b239d2d6927de2a2 100644 (file)
@@ -1824,7 +1824,7 @@ dissect_krb5_crealm(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int off
 static int
 dissect_krb5_PA_PAC_REQUEST_flag(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset)
 {
-       offset=dissect_ber_boolean(pinfo, tree, tvb, offset, hf_krb_PA_PAC_REQUEST_flag);
+       offset=dissect_ber_boolean(FALSE, pinfo, tree, tvb, offset, hf_krb_PA_PAC_REQUEST_flag);
        return offset;
 }
 
index 16c261b11d05431121d676d7409ca6d7e67d7d5a..70f7794382a1033aa9130add9df77ddbdc6d666a 100644 (file)
@@ -66,12 +66,12 @@ static int hf_ocsp_tbsRequest = -1;               /* TBSRequest */
 static int hf_ocsp_optionalSignature = -1;        /* Signature */
 static int hf_ocsp_version = -1;                  /* Version */
 static int hf_ocsp_requestorName = -1;            /* GeneralName */
-static int hf_ocsp_requestList = -1;              /* SEQUNCE_OF_Request */
+static int hf_ocsp_requestList = -1;              /* SEQUENCE_OF_Request */
 static int hf_ocsp_requestList_item = -1;         /* Request */
 static int hf_ocsp_requestExtensions = -1;        /* Extensions */
 static int hf_ocsp_signatureAlgorithm = -1;       /* AlgorithmIdentifier */
 static int hf_ocsp_signature = -1;                /* BIT_STRING */
-static int hf_ocsp_certs = -1;                    /* SEQUNCE_OF_Certificate */
+static int hf_ocsp_certs = -1;                    /* SEQUENCE_OF_Certificate */
 static int hf_ocsp_certs_item = -1;               /* Certificate */
 static int hf_ocsp_reqCert = -1;                  /* CertID */
 static int hf_ocsp_singleRequestExtensions = -1;  /* Extensions */
@@ -86,7 +86,7 @@ static int hf_ocsp_response = -1;                 /* T_response */
 static int hf_ocsp_tbsResponseData = -1;          /* ResponseData */
 static int hf_ocsp_responderID = -1;              /* ResponderID */
 static int hf_ocsp_producedAt = -1;               /* GeneralizedTime */
-static int hf_ocsp_responses = -1;                /* SEQUNCE_OF_SingleResponse */
+static int hf_ocsp_responses = -1;                /* SEQUENCE_OF_SingleResponse */
 static int hf_ocsp_responses_item = -1;           /* SingleResponse */
 static int hf_ocsp_responseExtensions = -1;       /* Extensions */
 static int hf_ocsp_byName = -1;                   /* Name */
@@ -118,16 +118,16 @@ static gint ett_ocsp = -1;
 
 static gint ett_ocsp_OCSPRequest = -1;
 static gint ett_ocsp_TBSRequest = -1;
-static gint ett_ocsp_SEQUNCE_OF_Request = -1;
+static gint ett_ocsp_SEQUENCE_OF_Request = -1;
 static gint ett_ocsp_Signature = -1;
-static gint ett_ocsp_SEQUNCE_OF_Certificate = -1;
+static gint ett_ocsp_SEQUENCE_OF_Certificate = -1;
 static gint ett_ocsp_Request = -1;
 static gint ett_ocsp_CertID = -1;
 static gint ett_ocsp_OCSPResponse = -1;
 static gint ett_ocsp_ResponseBytes = -1;
 static gint ett_ocsp_BasicOCSPResponse = -1;
 static gint ett_ocsp_ResponseData = -1;
-static gint ett_ocsp_SEQUNCE_OF_SingleResponse = -1;
+static gint ett_ocsp_SEQUENCE_OF_SingleResponse = -1;
 static gint ett_ocsp_ResponderID = -1;
 static gint ett_ocsp_SingleResponse = -1;
 static gint ett_ocsp_CertStatus = -1;
@@ -188,7 +188,7 @@ static int dissect_locator(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 }
 
 
-static const value_string OCSPVersion_vals[] = {
+static const value_string ocsp_Version_vals[] = {
   {   0, "v1" },
   { 0, NULL }
 };
@@ -258,19 +258,19 @@ static int dissect_requestList_item(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_ocsp_Request(FALSE, tvb, offset, pinfo, tree, hf_ocsp_requestList_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_Request_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_Request_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_requestList_item },
 };
 
 static int
-dissect_ocsp_SEQUNCE_OF_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_ocsp_SEQUENCE_OF_Request(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_Request_sequence_of, hf_index, ett_ocsp_SEQUNCE_OF_Request);
+                                   SEQUENCE_OF_Request_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Request);
 
   return offset;
 }
 static int dissect_requestList(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_ocsp_SEQUNCE_OF_Request(FALSE, tvb, offset, pinfo, tree, hf_ocsp_requestList);
+  return dissect_ocsp_SEQUENCE_OF_Request(FALSE, tvb, offset, pinfo, tree, hf_ocsp_requestList);
 }
 
 static const ber_sequence_t TBSRequest_sequence[] = {
@@ -305,19 +305,19 @@ static int dissect_signature(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
   return dissect_ocsp_BIT_STRING(FALSE, tvb, offset, pinfo, tree, hf_ocsp_signature);
 }
 
-static const ber_sequence_t SEQUNCE_OF_Certificate_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_Certificate_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_certs_item },
 };
 
 static int
-dissect_ocsp_SEQUNCE_OF_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_ocsp_SEQUENCE_OF_Certificate(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_Certificate_sequence_of, hf_index, ett_ocsp_SEQUNCE_OF_Certificate);
+                                   SEQUENCE_OF_Certificate_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_Certificate);
 
   return offset;
 }
 static int dissect_certs(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_ocsp_SEQUNCE_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certs);
+  return dissect_ocsp_SEQUENCE_OF_Certificate(FALSE, tvb, offset, pinfo, tree, hf_ocsp_certs);
 }
 
 static const ber_sequence_t Signature_sequence[] = {
@@ -353,7 +353,7 @@ dissect_ocsp_OCSPRequest(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
 }
 
 
-static const value_string OCSPResponseStatus_vals[] = {
+static const value_string ocsp_OCSPResponseStatus_vals[] = {
   {   0, "successful" },
   {   1, "malformedRequest" },
   {   2, "internalError" },
@@ -450,7 +450,7 @@ static int dissect_byKey(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
 }
 
 
-static const value_string ResponderID_vals[] = {
+static const value_string ocsp_ResponderID_vals[] = {
   {   1, "byName" },
   {   2, "byKey" },
   { 0, NULL }
@@ -542,7 +542,7 @@ static int dissect_unknown_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 }
 
 
-static const value_string CertStatus_vals[] = {
+static const value_string ocsp_CertStatus_vals[] = {
   {   0, "good" },
   {   1, "revoked" },
   {   2, "unknown" },
@@ -587,19 +587,19 @@ static int dissect_responses_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_ocsp_SingleResponse(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responses_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_SingleResponse_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_SingleResponse_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_responses_item },
 };
 
 static int
-dissect_ocsp_SEQUNCE_OF_SingleResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_ocsp_SEQUENCE_OF_SingleResponse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_SingleResponse_sequence_of, hf_index, ett_ocsp_SEQUNCE_OF_SingleResponse);
+                                   SEQUENCE_OF_SingleResponse_sequence_of, hf_index, ett_ocsp_SEQUENCE_OF_SingleResponse);
 
   return offset;
 }
 static int dissect_responses(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_ocsp_SEQUNCE_OF_SingleResponse(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responses);
+  return dissect_ocsp_SEQUENCE_OF_SingleResponse(FALSE, tvb, offset, pinfo, tree, hf_ocsp_responses);
 }
 
 static const ber_sequence_t ResponseData_sequence[] = {
@@ -838,11 +838,11 @@ void proto_register_ocsp(void) {
         "OCSPRequest/optionalSignature", HFILL }},
     { &hf_ocsp_version,
       { "version", "ocsp.version",
-        FT_INT32, BASE_DEC, VALS(OCSPVersion_vals), 0,
+        FT_INT32, BASE_DEC, VALS(x509af_Version_vals), 0,
         "", HFILL }},
     { &hf_ocsp_requestorName,
       { "requestorName", "ocsp.requestorName",
-        FT_UINT32, BASE_DEC, VALS(GeneralName_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "TBSRequest/requestorName", HFILL }},
     { &hf_ocsp_requestList,
       { "requestList", "ocsp.requestList",
@@ -898,7 +898,7 @@ void proto_register_ocsp(void) {
         "CertID/serialNumber", HFILL }},
     { &hf_ocsp_responseStatus,
       { "responseStatus", "ocsp.responseStatus",
-        FT_UINT32, BASE_DEC, VALS(OCSPResponseStatus_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(ocsp_OCSPResponseStatus_vals), 0,
         "OCSPResponse/responseStatus", HFILL }},
     { &hf_ocsp_responseBytes,
       { "responseBytes", "ocsp.responseBytes",
@@ -918,7 +918,7 @@ void proto_register_ocsp(void) {
         "BasicOCSPResponse/tbsResponseData", HFILL }},
     { &hf_ocsp_responderID,
       { "responderID", "ocsp.responderID",
-        FT_UINT32, BASE_DEC, VALS(ResponderID_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(ocsp_ResponderID_vals), 0,
         "ResponseData/responderID", HFILL }},
     { &hf_ocsp_producedAt,
       { "producedAt", "ocsp.producedAt",
@@ -950,7 +950,7 @@ void proto_register_ocsp(void) {
         "SingleResponse/certID", HFILL }},
     { &hf_ocsp_certStatus,
       { "certStatus", "ocsp.certStatus",
-        FT_UINT32, BASE_DEC, VALS(CertStatus_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(ocsp_CertStatus_vals), 0,
         "SingleResponse/certStatus", HFILL }},
     { &hf_ocsp_thisUpdate,
       { "thisUpdate", "ocsp.thisUpdate",
@@ -982,7 +982,7 @@ void proto_register_ocsp(void) {
         "RevokedInfo/revocationTime", HFILL }},
     { &hf_ocsp_revocationReason,
       { "revocationReason", "ocsp.revocationReason",
-        FT_UINT32, BASE_DEC, VALS(CRLReason_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_CRLReason_vals), 0,
         "RevokedInfo/revocationReason", HFILL }},
     { &hf_ocsp_AcceptableResponses_item,
       { "Item", "ocsp.AcceptableResponses_item",
@@ -1021,16 +1021,16 @@ void proto_register_ocsp(void) {
 
     &ett_ocsp_OCSPRequest,
     &ett_ocsp_TBSRequest,
-    &ett_ocsp_SEQUNCE_OF_Request,
+    &ett_ocsp_SEQUENCE_OF_Request,
     &ett_ocsp_Signature,
-    &ett_ocsp_SEQUNCE_OF_Certificate,
+    &ett_ocsp_SEQUENCE_OF_Certificate,
     &ett_ocsp_Request,
     &ett_ocsp_CertID,
     &ett_ocsp_OCSPResponse,
     &ett_ocsp_ResponseBytes,
     &ett_ocsp_BasicOCSPResponse,
     &ett_ocsp_ResponseData,
-    &ett_ocsp_SEQUNCE_OF_SingleResponse,
+    &ett_ocsp_SEQUENCE_OF_SingleResponse,
     &ett_ocsp_ResponderID,
     &ett_ocsp_SingleResponse,
     &ett_ocsp_CertStatus,
index c624b32501556501551c8a8ae69842bcca984153..0524e56036fb4c2ce07248be4b7ad34e772811ab 100644 (file)
@@ -224,7 +224,7 @@ void proto_register_pkcs1(void) {
         "", HFILL }},
     { &hf_pkcs1_version,
       { "version", "pkcs1.version",
-        FT_INT32, BASE_DEC, VALS(Version_vals), 0,
+        FT_INT32, BASE_DEC, VALS(x509af_Version_vals), 0,
         "RSAPrivateKey/version", HFILL }},
     { &hf_pkcs1_privateExponent,
       { "privateExponent", "pkcs1.privateExponent",
index a20c98eb6fbd2e3d062595137323be3a4e467108..6cfa0a555e7b30955d97b65c145bcde8981dfae9 100644 (file)
@@ -10,7 +10,7 @@
 /* packet-pkix1explicit.c
  * Routines for PKIX1Explitic packet dissection
  *
- * $Id: packet-pkix1explicit-template.c 12617 2004-11-29 08:43:19Z sahlberg $
+ * $Id: packet-pkix1explicit-template.c 12826 2004-12-24 12:16:27Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -170,7 +170,7 @@ static int dissect_extnId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 
 static int
 dissect_pkix1explicit_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
 
   return offset;
 }
@@ -381,7 +381,7 @@ dissect_pkix1explicit_DirectoryString(gboolean implicit_tag _U_, tvbuff_t *tvb,
 }
 
 
-const value_string TerminalType_vals[] = {
+const value_string pkix1explicit_TerminalType_vals[] = {
   {   3, "telex" },
   {   4, "teletex" },
   {   5, "g3-facsimile" },
index 2a12e6fa464e07398b66d3e71482b79fe4be54d0..3fa172f8ec78ccfcf625aa93790f9bd30efa3015 100644 (file)
@@ -8,7 +8,7 @@
 /* packet-pkix1explicit.h
  * Routines for PKIX1Explicit packet dissection
  *
- * $Id: packet-pkix1explicit-template.h 12617 2004-11-29 08:43:19Z sahlberg $
+ * $Id: packet-pkix1explicit-template.h 12826 2004-12-24 12:16:27Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -44,7 +44,7 @@ int dissect_pkix1explicit_SubjectPublicKeyInfo(gboolean implicit_tag, tvbuff_t *
 
 /*--- Included file: packet-pkix1explicit-exp.h ---*/
 
-extern const value_string TerminalType_vals[];
+extern const value_string pkix1explicit_TerminalType_vals[];
 int dissect_pkix1explicit_CertificateSerialNumber(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_pkix1explicit_Extensions(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_pkix1explicit_Extension(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
index c7f8c7a6748fff079d2530c10d3fbf30e22e9f6f..d462c3c34bd36adc76e616eb1f5bfe5005617634 100644 (file)
@@ -135,7 +135,7 @@ dissect_pkixqualified_Printablestring(gboolean implicit_tag _U_, tvbuff_t *tvb,
 }
 
 
-static const value_string PredefinedBiometricType_vals[] = {
+static const value_string pkixqualified_PredefinedBiometricType_vals[] = {
   {   0, "picture" },
   {   1, "handwritten-signature" },
   { 0, NULL }
@@ -168,7 +168,7 @@ static int dissect_semanticsIdentifier(packet_info *pinfo, proto_tree *tree, tvb
 }
 
 
-static const value_string TypeOfBiometricData_vals[] = {
+static const value_string pkixqualified_TypeOfBiometricData_vals[] = {
   {   0, "predefinedBiometricType" },
   {   1, "biometricDataOid" },
   { 0, NULL }
@@ -395,7 +395,7 @@ void proto_register_pkixqualified(void) {
         "BiometricSyntax/_item", HFILL }},
     { &hf_pkixqualified_typeOfBiometricData,
       { "typeOfBiometricData", "pkixqualified.typeOfBiometricData",
-        FT_UINT32, BASE_DEC, VALS(TypeOfBiometricData_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(pkixqualified_TypeOfBiometricData_vals), 0,
         "BiometricData/typeOfBiometricData", HFILL }},
     { &hf_pkixqualified_hashAlgorithm,
       { "hashAlgorithm", "pkixqualified.hashAlgorithm",
@@ -411,7 +411,7 @@ void proto_register_pkixqualified(void) {
         "BiometricData/sourceDataUri", HFILL }},
     { &hf_pkixqualified_predefinedBiometricType,
       { "predefinedBiometricType", "pkixqualified.predefinedBiometricType",
-        FT_INT32, BASE_DEC, VALS(PredefinedBiometricType_vals), 0,
+        FT_INT32, BASE_DEC, VALS(pkixqualified_PredefinedBiometricType_vals), 0,
         "TypeOfBiometricData/predefinedBiometricType", HFILL }},
     { &hf_pkixqualified_biometricDataOid,
       { "biometricDataOid", "pkixqualified.biometricDataOid",
@@ -439,7 +439,7 @@ void proto_register_pkixqualified(void) {
         "SemanticsInformation/nameRegistrationAuthorities", HFILL }},
     { &hf_pkixqualified_NameRegistrationAuthorities_item,
       { "Item", "pkixqualified.NameRegistrationAuthorities_item",
-        FT_UINT32, BASE_DEC, VALS(GeneralName_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "NameRegistrationAuthorities/_item", HFILL }},
 
 /*--- End of included file: packet-pkixqualified-hfarr.c ---*/
index ff37dd9211dde20eb1148cf002e33bc743647313..5e0b352b216ae52b0f29da68c4b5cb8701a0f000 100644 (file)
@@ -123,7 +123,7 @@ static int dissect_tsa_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 }
 
 
-static const value_string T_version_vals[] = {
+static const value_string pkixtsp_T_version_vals[] = {
   {   1, "v1" },
   { 0, NULL }
 };
@@ -204,7 +204,7 @@ static int dissect_seconds(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 
 static int
 dissect_pkixtsp_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
 
   return offset;
 }
@@ -234,7 +234,7 @@ dissect_pkixtsp_TimeStampReq(gboolean implicit_tag _U_, tvbuff_t *tvb, int offse
 }
 
 
-static const value_string PKIStatus_vals[] = {
+static const value_string pkixtsp_PKIStatus_vals[] = {
   {   0, "granted" },
   {   1, "grantedWithMods" },
   {   2, "rejection" },
@@ -322,7 +322,7 @@ dissect_pkixtsp_TimeStampResp(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 }
 
 
-static const value_string tst_version_vals[] = {
+static const value_string pkixtsp_tst_version_vals[] = {
   {   1, "v1" },
   { 0, NULL }
 };
@@ -468,7 +468,7 @@ void proto_register_pkixtsp(void) {
 
     { &hf_pkixtsp_version,
       { "version", "pkixtsp.version",
-        FT_INT32, BASE_DEC, VALS(T_version_vals), 0,
+        FT_INT32, BASE_DEC, VALS(pkixtsp_T_version_vals), 0,
         "TimeStampReq/version", HFILL }},
     { &hf_pkixtsp_messageImprint,
       { "messageImprint", "pkixtsp.messageImprint",
@@ -508,7 +508,7 @@ void proto_register_pkixtsp(void) {
         "TimeStampResp/timeStampToken", HFILL }},
     { &hf_pkixtsp_pki_status,
       { "status", "pkixtsp.status",
-        FT_INT32, BASE_DEC, VALS(PKIStatus_vals), 0,
+        FT_INT32, BASE_DEC, VALS(pkixtsp_PKIStatus_vals), 0,
         "PKIStatusInfo/status", HFILL }},
     { &hf_pkixtsp_failInfo,
       { "failInfo", "pkixtsp.failInfo",
@@ -516,7 +516,7 @@ void proto_register_pkixtsp(void) {
         "PKIStatusInfo/failInfo", HFILL }},
     { &hf_pkixtsp_tst_version,
       { "version", "pkixtsp.version",
-        FT_INT32, BASE_DEC, VALS(tst_version_vals), 0,
+        FT_INT32, BASE_DEC, VALS(pkixtsp_tst_version_vals), 0,
         "TSTInfo/version", HFILL }},
     { &hf_pkixtsp_policy,
       { "policy", "pkixtsp.policy",
index 029903abdcd49cb5fbf06f944a19a85b4e25bd58..8948b21c32a234c90fab767bcaf5606c38eb227e 100644 (file)
@@ -117,7 +117,7 @@ static gint ett_smrse_RPAlertSC = -1;
 
 
 
-static const value_string T_address_type_vals[] = {
+static const value_string smrse_T_address_type_vals[] = {
   {   0, "unknown-type" },
   {   1, "internat-number" },
   {   2, "national-number" },
@@ -138,7 +138,7 @@ static int dissect_address_type(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 }
 
 
-static const value_string T_numbering_plan_vals[] = {
+static const value_string smrse_T_numbering_plan_vals[] = {
   {   0, "unknown-numbering" },
   {   1, "iSDN-numbering" },
   {   3, "data-network-numbering" },
@@ -207,7 +207,7 @@ static int dissect_octet_format(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 }
 
 
-static const value_string T_address_value_vals[] = {
+static const value_string smrse_T_address_value_vals[] = {
   {   0, "octet-format" },
   { 0, NULL }
 };
@@ -319,7 +319,7 @@ dissect_smrse_SMR_Bind_Confirm(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 }
 
 
-static const value_string Connect_fail_vals[] = {
+static const value_string smrse_Connect_fail_vals[] = {
   {   0, "not-entitled" },
   {   1, "tmp-overload" },
   {   2, "tmp-failure" },
@@ -368,7 +368,7 @@ dissect_smrse_SMR_Unbind(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, p
 
 static int
 dissect_smrse_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
 
   return offset;
 }
@@ -481,7 +481,7 @@ dissect_smrse_RPAck(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet
 }
 
 
-static const value_string Error_reason_vals[] = {
+static const value_string smrse_Error_reason_vals[] = {
   {   1, "unknown-subscriber" },
   {   9, "illegal-subscriber" },
   {  11, "teleservice-not-provisioned" },
@@ -666,15 +666,15 @@ void proto_register_smrse(void) {
         "SMR-Bind/password", HFILL }},
     { &hf_smrse_address_type,
       { "address-type", "smrse.address_type",
-        FT_INT32, BASE_DEC, VALS(T_address_type_vals), 0,
+        FT_INT32, BASE_DEC, VALS(smrse_T_address_type_vals), 0,
         "SMS-Address/address-type", HFILL }},
     { &hf_smrse_numbering_plan,
       { "numbering-plan", "smrse.numbering_plan",
-        FT_INT32, BASE_DEC, VALS(T_numbering_plan_vals), 0,
+        FT_INT32, BASE_DEC, VALS(smrse_T_numbering_plan_vals), 0,
         "SMS-Address/numbering-plan", HFILL }},
     { &hf_smrse_address_value,
       { "address-value", "smrse.address_value",
-        FT_UINT32, BASE_DEC, VALS(T_address_value_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(smrse_T_address_value_vals), 0,
         "SMS-Address/address-value", HFILL }},
     { &hf_smrse_octet_format,
       { "octet-format", "smrse.octet_format",
@@ -682,7 +682,7 @@ void proto_register_smrse(void) {
         "SMS-Address/address-value/octet-format", HFILL }},
     { &hf_smrse_connect_fail_reason,
       { "connect-fail-reason", "smrse.connect_fail_reason",
-        FT_INT32, BASE_DEC, VALS(Connect_fail_vals), 0,
+        FT_INT32, BASE_DEC, VALS(smrse_Connect_fail_vals), 0,
         "SMR-Bind-Failure/connect-fail-reason", HFILL }},
     { &hf_smrse_mt_priority_request,
       { "mt-priority-request", "smrse.mt_priority_request",
@@ -742,7 +742,7 @@ void proto_register_smrse(void) {
         "", HFILL }},
     { &hf_smrse_error_reason,
       { "error-reason", "smrse.error_reason",
-        FT_INT32, BASE_DEC, VALS(Error_reason_vals), 0,
+        FT_INT32, BASE_DEC, VALS(smrse_Error_reason_vals), 0,
         "RPError/error-reason", HFILL }},
     { &hf_smrse_msg_waiting_set,
       { "msg-waiting-set", "smrse.msg_waiting_set",
index 8775efdf3f711a4093cb3fffb31ee55ddd146637..f460edf4486d1628ca0ebc865e4a32ecd4ed6594 100644 (file)
@@ -91,7 +91,7 @@ static int hf_x509af_userCertificate = -1;        /* Certificate */
 static int hf_x509af_certificationPath = -1;      /* ForwardCertificationPath */
 static int hf_x509af_ForwardCertificationPath_item = -1;  /* CrossCertificates */
 static int hf_x509af_CrossCertificates_item = -1;  /* Certificate */
-static int hf_x509af_theCACertificates = -1;      /* SEQUNCE_OF_CertificatePair */
+static int hf_x509af_theCACertificates = -1;      /* SEQUENCE_OF_CertificatePair */
 static int hf_x509af_theCACertificates_item = -1;  /* CertificatePair */
 static int hf_x509af_issuedByThisCA = -1;         /* Certificate */
 static int hf_x509af_issuedToThisCA = -1;         /* Certificate */
@@ -105,7 +105,7 @@ static int hf_x509af_revocationDate = -1;         /* Time */
 static int hf_x509af_crlEntryExtensions = -1;     /* Extensions */
 static int hf_x509af_crlExtensions = -1;          /* Extensions */
 static int hf_x509af_attributeCertificate = -1;   /* AttributeCertificate */
-static int hf_x509af_acPath = -1;                 /* SEQUNCE_OF_ACPathData */
+static int hf_x509af_acPath = -1;                 /* SEQUENCE_OF_ACPathData */
 static int hf_x509af_acPath_item = -1;            /* ACPathData */
 static int hf_x509af_certificate = -1;            /* Certificate */
 static int hf_x509af_signedAttributeCertificateInfo = -1;  /* AttributeCertificateInfo */
@@ -114,7 +114,7 @@ static int hf_x509af_baseCertificateID = -1;      /* IssuerSerial */
 static int hf_x509af_infoSubjectName = -1;        /* GeneralNames */
 static int hf_x509af_issuerName = -1;             /* GeneralNames */
 static int hf_x509af_attCertValidityPeriod = -1;  /* AttCertValidityPeriod */
-static int hf_x509af_attributes = -1;             /* SEQUNCE_OF_Attribute */
+static int hf_x509af_attributes = -1;             /* SEQUENCE_OF_Attribute */
 static int hf_x509af_attributes_item = -1;        /* Attribute */
 static int hf_x509af_issuerUniqueID = -1;         /* UniqueIdentifier */
 static int hf_x509af_serial = -1;                 /* CertificateSerialNumber */
@@ -148,19 +148,19 @@ static gint ett_x509af_Certificates = -1;
 static gint ett_x509af_ForwardCertificationPath = -1;
 static gint ett_x509af_CrossCertificates = -1;
 static gint ett_x509af_CertificationPath = -1;
-static gint ett_x509af_SEQUNCE_OF_CertificatePair = -1;
+static gint ett_x509af_SEQUENCE_OF_CertificatePair = -1;
 static gint ett_x509af_CertificatePair = -1;
 static gint ett_x509af_CertificateList = -1;
 static gint ett_x509af_T_signedCertificateList = -1;
 static gint ett_x509af_T_revokedCertificates = -1;
 static gint ett_x509af_T_revokedCertificates_item = -1;
 static gint ett_x509af_AttributeCertificationPath = -1;
-static gint ett_x509af_SEQUNCE_OF_ACPathData = -1;
+static gint ett_x509af_SEQUENCE_OF_ACPathData = -1;
 static gint ett_x509af_ACPathData = -1;
 static gint ett_x509af_AttributeCertificate = -1;
 static gint ett_x509af_AttributeCertificateInfo = -1;
 static gint ett_x509af_InfoSubject = -1;
-static gint ett_x509af_SEQUNCE_OF_Attribute = -1;
+static gint ett_x509af_SEQUENCE_OF_Attribute = -1;
 static gint ett_x509af_IssuerSerial = -1;
 static gint ett_x509af_AttCertValidityPeriod = -1;
 static gint ett_x509af_AttributeCertificateAssertion = -1;
@@ -219,7 +219,7 @@ static int dissect_attType_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 }
 
 
-const value_string Version_vals[] = {
+const value_string x509af_Version_vals[] = {
   {   0, "v1" },
   {   1, "v2" },
   {   2, "v3" },
@@ -338,7 +338,7 @@ static int dissect_attCertValidity(packet_info *pinfo, proto_tree *tree, tvbuff_
 }
 
 
-const value_string Time_vals[] = {
+const value_string x509af_Time_vals[] = {
   {   0, "utcTime" },
   {   1, "generalizedTime" },
   { 0, NULL }
@@ -439,7 +439,7 @@ static int dissect_extnId(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 
 static int
 dissect_x509af_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
 
   return offset;
 }
@@ -621,19 +621,19 @@ static int dissect_theCACertificates_item(packet_info *pinfo, proto_tree *tree,
   return dissect_x509af_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_CertificatePair_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_CertificatePair_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_theCACertificates_item },
 };
 
 static int
-dissect_x509af_SEQUNCE_OF_CertificatePair(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509af_SEQUENCE_OF_CertificatePair(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_CertificatePair_sequence_of, hf_index, ett_x509af_SEQUNCE_OF_CertificatePair);
+                                   SEQUENCE_OF_CertificatePair_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_CertificatePair);
 
   return offset;
 }
 static int dissect_theCACertificates(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509af_SEQUNCE_OF_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates);
+  return dissect_x509af_SEQUENCE_OF_CertificatePair(FALSE, tvb, offset, pinfo, tree, hf_x509af_theCACertificates);
 }
 
 static const ber_sequence_t CertificationPath_sequence[] = {
@@ -739,7 +739,7 @@ static int dissect_baseCertificateID(packet_info *pinfo, proto_tree *tree, tvbuf
 }
 
 
-static const value_string InfoSubject_vals[] = {
+static const value_string x509af_InfoSubject_vals[] = {
   {   0, "baseCertificateID" },
   {   1, "subjectName" },
   { 0, NULL }
@@ -779,19 +779,19 @@ static int dissect_attCertValidityPeriod(packet_info *pinfo, proto_tree *tree, t
   return dissect_x509af_AttCertValidityPeriod(FALSE, tvb, offset, pinfo, tree, hf_x509af_attCertValidityPeriod);
 }
 
-static const ber_sequence_t SEQUNCE_OF_Attribute_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_Attribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributes_item },
 };
 
 static int
-dissect_x509af_SEQUNCE_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509af_SEQUENCE_OF_Attribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_Attribute_sequence_of, hf_index, ett_x509af_SEQUNCE_OF_Attribute);
+                                   SEQUENCE_OF_Attribute_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_Attribute);
 
   return offset;
 }
 static int dissect_attributes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509af_SEQUNCE_OF_Attribute(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributes);
+  return dissect_x509af_SEQUENCE_OF_Attribute(FALSE, tvb, offset, pinfo, tree, hf_x509af_attributes);
 }
 
 static const ber_sequence_t AttributeCertificateInfo_sequence[] = {
@@ -853,19 +853,19 @@ static int dissect_acPath_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
   return dissect_x509af_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_ACPathData_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_ACPathData_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_acPath_item },
 };
 
 static int
-dissect_x509af_SEQUNCE_OF_ACPathData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509af_SEQUENCE_OF_ACPathData(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_ACPathData_sequence_of, hf_index, ett_x509af_SEQUNCE_OF_ACPathData);
+                                   SEQUENCE_OF_ACPathData_sequence_of, hf_index, ett_x509af_SEQUENCE_OF_ACPathData);
 
   return offset;
 }
 static int dissect_acPath(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509af_SEQUNCE_OF_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath);
+  return dissect_x509af_SEQUENCE_OF_ACPathData(FALSE, tvb, offset, pinfo, tree, hf_x509af_acPath);
 }
 
 static const ber_sequence_t AttributeCertificationPath_sequence[] = {
@@ -883,7 +883,7 @@ dissect_x509af_AttributeCertificationPath(gboolean implicit_tag _U_, tvbuff_t *t
 }
 
 
-static const value_string AssertionSubject_vals[] = {
+static const value_string x509af_AssertionSubject_vals[] = {
   {   0, "baseCertificateID" },
   {   1, "subjectName" },
   { 0, NULL }
@@ -1019,7 +1019,7 @@ void proto_register_x509af(void) {
         "Certificate/signedCertificate", HFILL }},
     { &hf_x509af_version,
       { "version", "x509af.version",
-        FT_INT32, BASE_DEC, VALS(Version_vals), 0,
+        FT_INT32, BASE_DEC, VALS(x509af_Version_vals), 0,
         "", HFILL }},
     { &hf_x509af_serialNumber,
       { "serialNumber", "x509af.serialNumber",
@@ -1031,7 +1031,7 @@ void proto_register_x509af(void) {
         "", HFILL }},
     { &hf_x509af_issuer,
       { "issuer", "x509af.issuer",
-        FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "", HFILL }},
     { &hf_x509af_validity,
       { "validity", "x509af.validity",
@@ -1039,7 +1039,7 @@ void proto_register_x509af(void) {
         "Certificate/signedCertificate/validity", HFILL }},
     { &hf_x509af_subject,
       { "subject", "x509af.subject",
-        FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Certificate/signedCertificate/subject", HFILL }},
     { &hf_x509af_subjectPublicKeyInfo,
       { "subjectPublicKeyInfo", "x509af.subjectPublicKeyInfo",
@@ -1075,11 +1075,11 @@ void proto_register_x509af(void) {
         "AlgorithmIdentifier/parameters", HFILL }},
     { &hf_x509af_notBefore,
       { "notBefore", "x509af.notBefore",
-        FT_UINT32, BASE_DEC, VALS(Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
         "Validity/notBefore", HFILL }},
     { &hf_x509af_notAfter,
       { "notAfter", "x509af.notAfter",
-        FT_UINT32, BASE_DEC, VALS(Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
         "Validity/notAfter", HFILL }},
     { &hf_x509af_algorithm,
       { "algorithm", "x509af.algorithm",
@@ -1151,11 +1151,11 @@ void proto_register_x509af(void) {
         "CertificateList/signedCertificateList", HFILL }},
     { &hf_x509af_thisUpdate,
       { "thisUpdate", "x509af.thisUpdate",
-        FT_UINT32, BASE_DEC, VALS(Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
         "CertificateList/signedCertificateList/thisUpdate", HFILL }},
     { &hf_x509af_nextUpdate,
       { "nextUpdate", "x509af.nextUpdate",
-        FT_UINT32, BASE_DEC, VALS(Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
         "CertificateList/signedCertificateList/nextUpdate", HFILL }},
     { &hf_x509af_revokedCertificates,
       { "revokedCertificates", "x509af.revokedCertificates",
@@ -1171,7 +1171,7 @@ void proto_register_x509af(void) {
         "CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate", HFILL }},
     { &hf_x509af_revocationDate,
       { "revocationDate", "x509af.revocationDate",
-        FT_UINT32, BASE_DEC, VALS(Time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509af_Time_vals), 0,
         "CertificateList/signedCertificateList/revokedCertificates/_item/revocationDate", HFILL }},
     { &hf_x509af_crlEntryExtensions,
       { "crlEntryExtensions", "x509af.crlEntryExtensions",
@@ -1203,7 +1203,7 @@ void proto_register_x509af(void) {
         "AttributeCertificate/signedAttributeCertificateInfo", HFILL }},
     { &hf_x509af_info_subject,
       { "subject", "x509af.subject",
-        FT_UINT32, BASE_DEC, VALS(InfoSubject_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509af_InfoSubject_vals), 0,
         "AttributeCertificateInfo/subject", HFILL }},
     { &hf_x509af_baseCertificateID,
       { "baseCertificateID", "x509af.baseCertificateID",
@@ -1251,15 +1251,15 @@ void proto_register_x509af(void) {
         "AttCertValidityPeriod/notAfterTime", HFILL }},
     { &hf_x509af_assertion_subject,
       { "subject", "x509af.subject",
-        FT_UINT32, BASE_DEC, VALS(AssertionSubject_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509af_AssertionSubject_vals), 0,
         "AttributeCertificateAssertion/subject", HFILL }},
     { &hf_x509af_assertionSubjectName,
       { "subjectName", "x509af.subjectName",
-        FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "AttributeCertificateAssertion/subject/subjectName", HFILL }},
     { &hf_x509af_assertionIssuer,
       { "issuer", "x509af.issuer",
-        FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "AttributeCertificateAssertion/issuer", HFILL }},
     { &hf_x509af_attCertValidity,
       { "attCertValidity", "x509af.attCertValidity",
@@ -1296,19 +1296,19 @@ void proto_register_x509af(void) {
     &ett_x509af_ForwardCertificationPath,
     &ett_x509af_CrossCertificates,
     &ett_x509af_CertificationPath,
-    &ett_x509af_SEQUNCE_OF_CertificatePair,
+    &ett_x509af_SEQUENCE_OF_CertificatePair,
     &ett_x509af_CertificatePair,
     &ett_x509af_CertificateList,
     &ett_x509af_T_signedCertificateList,
     &ett_x509af_T_revokedCertificates,
     &ett_x509af_T_revokedCertificates_item,
     &ett_x509af_AttributeCertificationPath,
-    &ett_x509af_SEQUNCE_OF_ACPathData,
+    &ett_x509af_SEQUENCE_OF_ACPathData,
     &ett_x509af_ACPathData,
     &ett_x509af_AttributeCertificate,
     &ett_x509af_AttributeCertificateInfo,
     &ett_x509af_InfoSubject,
-    &ett_x509af_SEQUNCE_OF_Attribute,
+    &ett_x509af_SEQUENCE_OF_Attribute,
     &ett_x509af_IssuerSerial,
     &ett_x509af_AttCertValidityPeriod,
     &ett_x509af_AttributeCertificateAssertion,
index 843e5f2910d58ad0b9757d3a28685401e19f8fb1..1df9aa348fa99fce532700dc33c697726cef1629 100644 (file)
@@ -36,8 +36,8 @@
 
 /*--- Included file: packet-x509af-exp.h ---*/
 
-extern const value_string Version_vals[];
-extern const value_string Time_vals[];
+extern const value_string x509af_Version_vals[];
+extern const value_string x509af_Time_vals[];
 int dissect_x509af_Certificate(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_x509af_Version(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_x509af_CertificateSerialNumber(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
index 215e53c1ca73ef370845bca7e6dce2cafe0641be..e329b8f6454572c90966cea21ea1b0a32afb8fdf 100644 (file)
@@ -92,7 +92,7 @@ static int hf_x509ce_notBefore = -1;              /* GeneralizedTime */
 static int hf_x509ce_notAfter = -1;               /* GeneralizedTime */
 static int hf_x509ce_CertificatePoliciesSyntax_item = -1;  /* PolicyInformation */
 static int hf_x509ce_policyIdentifier = -1;       /* CertPolicyId */
-static int hf_x509ce_policyQualifiers = -1;       /* SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo */
+static int hf_x509ce_policyQualifiers = -1;       /* SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo */
 static int hf_x509ce_policyQualifiers_item = -1;  /* PolicyQualifierInfo */
 static int hf_x509ce_policyQualifierId = -1;      /* PolicyQualifierId */
 static int hf_x509ce_qualifier = -1;              /* PolicyQualifierValue */
@@ -219,7 +219,7 @@ static gint ett_x509ce_KeyPurposeIDs = -1;
 static gint ett_x509ce_PrivateKeyUsagePeriod = -1;
 static gint ett_x509ce_CertificatePoliciesSyntax = -1;
 static gint ett_x509ce_PolicyInformation = -1;
-static gint ett_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo = -1;
+static gint ett_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo = -1;
 static gint ett_x509ce_PolicyQualifierInfo = -1;
 static gint ett_x509ce_PolicyMappingsSyntax = -1;
 static gint ett_x509ce_PolicyMappingsSyntax_item = -1;
@@ -390,7 +390,7 @@ static int dissect_otherNameForm(packet_info *pinfo, proto_tree *tree, tvbuff_t
 }
 
 
-const value_string GeneralName_vals[] = {
+const value_string x509ce_GeneralName_vals[] = {
   {   1, "rfc822Name" },
   {   2, "dNSName" },
   {   4, "directoryName" },
@@ -650,19 +650,19 @@ static int dissect_policyQualifiers_item(packet_info *pinfo, proto_tree *tree, t
   return dissect_x509ce_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers_item);
 }
 
-static const ber_sequence_t SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_policyQualifiers_item },
 };
 
 static int
-dissect_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of, hf_index, ett_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo);
+                                   SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo_sequence_of, hf_index, ett_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo);
 
   return offset;
 }
 static int dissect_policyQualifiers(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers);
+  return dissect_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo(FALSE, tvb, offset, pinfo, tree, hf_x509ce_policyQualifiers);
 }
 
 static const ber_sequence_t PolicyInformation_sequence[] = {
@@ -738,7 +738,7 @@ dissect_x509ce_AttributesSyntax(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
 
 static int
 dissect_x509ce_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
 
   return offset;
 }
@@ -915,7 +915,7 @@ static int dissect_maxCRLNumber_impl(packet_info *pinfo, proto_tree *tree, tvbuf
 }
 
 
-const value_string CRLReason_vals[] = {
+const value_string x509ce_CRLReason_vals[] = {
   {   0, "unspecified" },
   {   1, "keyCompromise" },
   {   2, "cACompromise" },
@@ -947,7 +947,7 @@ dissect_x509ce_HoldInstruction(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 }
 
 
-const value_string DistributionPointName_vals[] = {
+const value_string x509ce_DistributionPointName_vals[] = {
   {   0, "fullName" },
   {   1, "nameRelativeToCRLIssuer" },
   { 0, NULL }
@@ -1153,7 +1153,7 @@ static int dissect_cRLReferral_impl(packet_info *pinfo, proto_tree *tree, tvbuff
 }
 
 
-const value_string StatusReferral_vals[] = {
+const value_string x509ce_StatusReferral_vals[] = {
   {   0, "cRLReferral" },
   { 0, NULL }
 };
@@ -1187,7 +1187,7 @@ dissect_x509ce_StatusReferrals(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 }
 
 
-const value_string OrderedListSyntax_vals[] = {
+const value_string x509ce_OrderedListSyntax_vals[] = {
   {   0, "ascSerialNum" },
   {   1, "ascRevDate" },
   { 0, NULL }
@@ -1294,7 +1294,7 @@ static int dissect_cpea_issuedByThisCAAssertion_impl(packet_info *pinfo, proto_t
 }
 
 
-static const value_string T_builtinNameForm_vals[] = {
+static const value_string x509ce_T_builtinNameForm_vals[] = {
   {   1, "rfc822Name" },
   {   2, "dNSName" },
   {   3, "x400Address" },
@@ -1318,7 +1318,7 @@ static int dissect_builtinNameForm(packet_info *pinfo, proto_tree *tree, tvbuff_
 }
 
 
-const value_string AltNameType_vals[] = {
+const value_string x509ce_AltNameType_vals[] = {
   {   0, "builtinNameForm" },
   {   1, "otherNameForm" },
   { 0, NULL }
@@ -1633,7 +1633,7 @@ void proto_register_x509ce(void) {
         "CRLNumber", HFILL }},
     { &hf_x509ce_CRLReason_PDU,
       { "CRLReason", "x509ce.CRLReason",
-        FT_UINT32, BASE_DEC, VALS(CRLReason_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_CRLReason_vals), 0,
         "CRLReason", HFILL }},
     { &hf_x509ce_HoldInstruction_PDU,
       { "HoldInstruction", "x509ce.HoldInstruction",
@@ -1653,7 +1653,7 @@ void proto_register_x509ce(void) {
         "CRLStreamIdentifier", HFILL }},
     { &hf_x509ce_OrderedListSyntax_PDU,
       { "OrderedListSyntax", "x509ce.OrderedListSyntax",
-        FT_UINT32, BASE_DEC, VALS(OrderedListSyntax_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_OrderedListSyntax_vals), 0,
         "OrderedListSyntax", HFILL }},
     { &hf_x509ce_DeltaInformation_PDU,
       { "DeltaInformation", "x509ce.DeltaInformation",
@@ -1733,7 +1733,7 @@ void proto_register_x509ce(void) {
         "PolicyMappingsSyntax/_item/subjectDomainPolicy", HFILL }},
     { &hf_x509ce_GeneralNames_item,
       { "Item", "x509ce.GeneralNames_item",
-        FT_UINT32, BASE_DEC, VALS(GeneralName_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "GeneralNames/_item", HFILL }},
     { &hf_x509ce_rfc822Name,
       { "rfc822Name", "x509ce.rfc822Name",
@@ -1745,7 +1745,7 @@ void proto_register_x509ce(void) {
         "GeneralName/dNSName", HFILL }},
     { &hf_x509ce_directoryName,
       { "directoryName", "x509ce.directoryName",
-        FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "GeneralName/directoryName", HFILL }},
     { &hf_x509ce_ediPartyName,
       { "ediPartyName", "x509ce.ediPartyName",
@@ -1797,7 +1797,7 @@ void proto_register_x509ce(void) {
         "GeneralSubtrees/_item", HFILL }},
     { &hf_x509ce_base,
       { "base", "x509ce.base",
-        FT_UINT32, BASE_DEC, VALS(GeneralName_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "GeneralSubtree/base", HFILL }},
     { &hf_x509ce_minimum,
       { "minimum", "x509ce.minimum",
@@ -1821,11 +1821,11 @@ void proto_register_x509ce(void) {
         "CRLScopeSyntax/_item", HFILL }},
     { &hf_x509ce_authorityName,
       { "authorityName", "x509ce.authorityName",
-        FT_UINT32, BASE_DEC, VALS(GeneralName_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "PerAuthorityScope/authorityName", HFILL }},
     { &hf_x509ce_distributionPoint,
       { "distributionPoint", "x509ce.distributionPoint",
-        FT_UINT32, BASE_DEC, VALS(DistributionPointName_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_DistributionPointName_vals), 0,
         "", HFILL }},
     { &hf_x509ce_onlyContains,
       { "onlyContains", "x509ce.onlyContains",
@@ -1877,7 +1877,7 @@ void proto_register_x509ce(void) {
         "BaseRevocationInfo/baseThisUpdate", HFILL }},
     { &hf_x509ce_StatusReferrals_item,
       { "Item", "x509ce.StatusReferrals_item",
-        FT_UINT32, BASE_DEC, VALS(StatusReferral_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_StatusReferral_vals), 0,
         "StatusReferrals/_item", HFILL }},
     { &hf_x509ce_cRLReferral,
       { "cRLReferral", "x509ce.cRLReferral",
@@ -1885,11 +1885,11 @@ void proto_register_x509ce(void) {
         "StatusReferral/cRLReferral", HFILL }},
     { &hf_x509ce_crlr_issuer,
       { "issuer", "x509ce.issuer",
-        FT_UINT32, BASE_DEC, VALS(GeneralName_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "CRLReferral/issuer", HFILL }},
     { &hf_x509ce_location,
       { "location", "x509ce.location",
-        FT_UINT32, BASE_DEC, VALS(GeneralName_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "CRLReferral/location", HFILL }},
     { &hf_x509ce_deltaRefInfo,
       { "deltaRefInfo", "x509ce.deltaRefInfo",
@@ -1909,7 +1909,7 @@ void proto_register_x509ce(void) {
         "CRLReferral/lastChangedCRL", HFILL }},
     { &hf_x509ce_deltaLocation,
       { "deltaLocation", "x509ce.deltaLocation",
-        FT_UINT32, BASE_DEC, VALS(GeneralName_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_GeneralName_vals), 0,
         "", HFILL }},
     { &hf_x509ce_lastDelta,
       { "lastDelta", "x509ce.lastDelta",
@@ -1969,7 +1969,7 @@ void proto_register_x509ce(void) {
         "", HFILL }},
     { &hf_x509ce_issuer,
       { "issuer", "x509ce.issuer",
-        FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "", HFILL }},
     { &hf_x509ce_subjectKeyIdentifier,
       { "subjectKeyIdentifier", "x509ce.subjectKeyIdentifier",
@@ -1993,7 +1993,7 @@ void proto_register_x509ce(void) {
         "CertificateAssertion/keyUsage", HFILL }},
     { &hf_x509ce_subjectAltName,
       { "subjectAltName", "x509ce.subjectAltName",
-        FT_UINT32, BASE_DEC, VALS(AltNameType_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_AltNameType_vals), 0,
         "CertificateAssertion/subjectAltName", HFILL }},
     { &hf_x509ce_policy,
       { "policy", "x509ce.policy",
@@ -2001,11 +2001,11 @@ void proto_register_x509ce(void) {
         "CertificateAssertion/policy", HFILL }},
     { &hf_x509ce_pathToName,
       { "pathToName", "x509ce.pathToName",
-        FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "CertificateAssertion/pathToName", HFILL }},
     { &hf_x509ce_subject,
       { "subject", "x509ce.subject",
-        FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "CertificateAssertion/subject", HFILL }},
     { &hf_x509ce_nameConstraints,
       { "nameConstraints", "x509ce.nameConstraints",
@@ -2013,7 +2013,7 @@ void proto_register_x509ce(void) {
         "CertificateAssertion/nameConstraints", HFILL }},
     { &hf_x509ce_builtinNameForm,
       { "builtinNameForm", "x509ce.builtinNameForm",
-        FT_UINT32, BASE_DEC, VALS(T_builtinNameForm_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509ce_T_builtinNameForm_vals), 0,
         "AltNameType/builtinNameForm", HFILL }},
     { &hf_x509ce_otherNameForm,
       { "otherNameForm", "x509ce.otherNameForm",
@@ -2053,11 +2053,11 @@ void proto_register_x509ce(void) {
         "CertificateListAssertion/reasonFlags", HFILL }},
     { &hf_x509ce_firstIssuer,
       { "firstIssuer", "x509ce.firstIssuer",
-        FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "PkiPathMatchSyntax/firstIssuer", HFILL }},
     { &hf_x509ce_lastSubject,
       { "lastSubject", "x509ce.lastSubject",
-        FT_UINT32, BASE_DEC, VALS(Name_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "PkiPathMatchSyntax/lastSubject", HFILL }},
     { &hf_x509ce_KeyUsage_digitalSignature,
       { "digitalSignature", "x509ce.digitalSignature",
@@ -2167,7 +2167,7 @@ void proto_register_x509ce(void) {
     &ett_x509ce_PrivateKeyUsagePeriod,
     &ett_x509ce_CertificatePoliciesSyntax,
     &ett_x509ce_PolicyInformation,
-    &ett_x509ce_SEQUNCE_SIZE_1_MAX_OF_PolicyQualifierInfo,
+    &ett_x509ce_SEQUENCE_SIZE_1_MAX_OF_PolicyQualifierInfo,
     &ett_x509ce_PolicyQualifierInfo,
     &ett_x509ce_PolicyMappingsSyntax,
     &ett_x509ce_PolicyMappingsSyntax_item,
index 584bd6cd84093dccb2e0771bccdeb58da0f06533..df391c57d11158edbf792917077a6bb72447955b 100644 (file)
 
 /*--- Included file: packet-x509ce-exp.h ---*/
 
-extern const value_string GeneralName_vals[];
-extern const value_string CRLReason_vals[];
-extern const value_string StatusReferral_vals[];
-extern const value_string OrderedListSyntax_vals[];
-extern const value_string DistributionPointName_vals[];
-extern const value_string AltNameType_vals[];
+extern const value_string x509ce_GeneralName_vals[];
+extern const value_string x509ce_CRLReason_vals[];
+extern const value_string x509ce_StatusReferral_vals[];
+extern const value_string x509ce_OrderedListSyntax_vals[];
+extern const value_string x509ce_DistributionPointName_vals[];
+extern const value_string x509ce_AltNameType_vals[];
 int dissect_x509ce_AuthorityKeyIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_x509ce_KeyIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_x509ce_SubjectKeyIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
index bdb3beb0cc875fb7c79595651ff750a509cf1327..7a9f1a87bd41ab3bdb613917f1b8beb23a635412 100644 (file)
@@ -9,7 +9,7 @@
  * Routines for X.509 Information Framework packet dissection
  *  Ronnie Sahlberg 2004
  *
- * $Id: packet-x509if-template.c 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id: packet-x509if-template.c 12744 2004-12-13 12:43:48Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -74,7 +74,7 @@ static int hf_x509if_selectedContexts_item = -1;  /* ContextAssertion */
 static int hf_x509if_ca_contextType = -1;         /* ContextId */
 static int hf_x509if_ca_contextValues = -1;       /* SET_OF_ContextValue */
 static int hf_x509if_ca_contextValues_item = -1;  /* ContextValue */
-static int hf_x509if_ata_assertedContexts = -1;   /* SEQUNCE_OF_ContextAssertion */
+static int hf_x509if_ata_assertedContexts = -1;   /* SEQUENCE_OF_ContextAssertion */
 static int hf_x509if_assertedContexts_item = -1;  /* ContextAssertion */
 static int hf_x509if_rdnSequence = -1;            /* RDNSequence */
 static int hf_x509if_RDNSequence_item = -1;       /* RelativeDistinguishedName */
@@ -105,7 +105,7 @@ static int hf_x509if_nameForm = -1;               /* OBJECT_IDENTIFIER */
 static int hf_x509if_superiorStructureRules = -1;  /* SET_OF_RuleIdentifier */
 static int hf_x509if_superiorStructureRules_item = -1;  /* RuleIdentifier */
 static int hf_x509if_structuralObjectClass = -1;  /* OBJECT_IDENTIFIER */
-static int hf_x509if_auxiliaries = -1;            /* SET_OF_OBJECT_IDENTIFIER */
+static int hf_x509if_auxiliaries = -1;            /* T_auxiliaries */
 static int hf_x509if_auxiliaries_item = -1;       /* OBJECT_IDENTIFIER */
 static int hf_x509if_mandatory = -1;              /* SET_SIZE_1_MAX_OF_AttributeId */
 static int hf_x509if_mandatory_item = -1;         /* AttributeId */
@@ -114,24 +114,24 @@ static int hf_x509if_optional_item = -1;          /* AttributeId */
 static int hf_x509if_precluded = -1;              /* SET_SIZE_1_MAX_OF_AttributeId */
 static int hf_x509if_precluded_item = -1;         /* AttributeId */
 static int hf_x509if_attributeType = -1;          /* AttributeId */
-static int hf_x509if_mandatoryContexts = -1;      /* SET_OF_OBJECT_IDENTIFIER */
+static int hf_x509if_mandatoryContexts = -1;      /* T_mandatoryContexts */
 static int hf_x509if_mandatoryContexts_item = -1;  /* OBJECT_IDENTIFIER */
-static int hf_x509if_optionalContexts = -1;       /* SET_OF_OBJECT_IDENTIFIER */
+static int hf_x509if_optionalContexts = -1;       /* T_optionalContexts */
 static int hf_x509if_optionalContexts_item = -1;  /* OBJECT_IDENTIFIER */
 static int hf_x509if_id = -1;                     /* INTEGER */
 static int hf_x509if_dmdId = -1;                  /* OBJECT_IDENTIFIER */
 static int hf_x509if_serviceType = -1;            /* OBJECT_IDENTIFIER */
 static int hf_x509if_userClass = -1;              /* INTEGER */
-static int hf_x509if_inputAttributeTypes = -1;    /* SEQUNCE_OF_RequestAttribute */
+static int hf_x509if_inputAttributeTypes = -1;    /* SEQUENCE_OF_RequestAttribute */
 static int hf_x509if_inputAttributeTypes_item = -1;  /* RequestAttribute */
 static int hf_x509if_attributeCombination = -1;   /* AttributeCombination */
-static int hf_x509if_outputAttributeTypes = -1;   /* SEQUNCE_OF_ResultAttribute */
+static int hf_x509if_outputAttributeTypes = -1;   /* SEQUENCE_OF_ResultAttribute */
 static int hf_x509if_outputAttributeTypes_item = -1;  /* ResultAttribute */
 static int hf_x509if_defaultControls = -1;        /* ControlOptions */
 static int hf_x509if_mandatoryControls = -1;      /* ControlOptions */
 static int hf_x509if_searchRuleControls = -1;     /* ControlOptions */
 static int hf_x509if_relaxation = -1;             /* RelaxationPolicy */
-static int hf_x509if_additionalControl = -1;      /* SEQUNCE_OF_AttributeType */
+static int hf_x509if_additionalControl = -1;      /* SEQUENCE_OF_AttributeType */
 static int hf_x509if_additionalControl_item = -1;  /* AttributeType */
 static int hf_x509if_allowedSubset = -1;          /* AllowedSubset */
 static int hf_x509if_imposedSubset = -1;          /* ImposedSubset */
@@ -141,50 +141,50 @@ static int hf_x509if_name_item = -1;              /* DirectoryString */
 static int hf_x509if_description = -1;            /* DirectoryString */
 static int hf_x509if_obsolete = -1;               /* BOOLEAN */
 static int hf_x509if_includeSubtypes = -1;        /* BOOLEAN */
-static int hf_x509if_ra_selectedValues = -1;      /* SEQUNCE_OF_SelectedValues */
+static int hf_x509if_ra_selectedValues = -1;      /* SEQUENCE_OF_SelectedValues */
 static int hf_x509if_ra_selectedValues_item = -1;  /* SelectedValues */
 static int hf_x509if_defaultValues = -1;          /* T_defaultValues */
 static int hf_x509if_defaultValues_item = -1;     /* T_defaultValues_item */
 static int hf_x509if_entryType = -1;              /* DefaultValueType */
-static int hf_x509if_ra_values = -1;              /* SEQUNCE_OF_DefaultValueValues */
+static int hf_x509if_ra_values = -1;              /* SEQUENCE_OF_DefaultValueValues */
 static int hf_x509if_ra_values_item = -1;         /* DefaultValueValues */
-static int hf_x509if_contexts = -1;               /* SEQUNCE_OF_ContextProfile */
+static int hf_x509if_contexts = -1;               /* SEQUENCE_OF_ContextProfile */
 static int hf_x509if_contexts_item = -1;          /* ContextProfile */
 static int hf_x509if_contextCombination = -1;     /* ContextCombination */
-static int hf_x509if_matchingUse = -1;            /* SEQUNCE_OF_MatchingUse */
+static int hf_x509if_matchingUse = -1;            /* SEQUENCE_OF_MatchingUse */
 static int hf_x509if_matchingUse_item = -1;       /* MatchingUse */
-static int hf_x509if_contextValue = -1;           /* SEQUNCE_OF_AttributeValue */
+static int hf_x509if_contextValue = -1;           /* SEQUENCE_OF_AttributeValue */
 static int hf_x509if_contextValue_item = -1;      /* AttributeValue */
 static int hf_x509if_context = -1;                /* OBJECT_IDENTIFIER */
-static int hf_x509if_contextcombination_and = -1;  /* SEQUNCE_OF_ContextCombination */
+static int hf_x509if_contextcombination_and = -1;  /* SEQUENCE_OF_ContextCombination */
 static int hf_x509if_contextcombination_and_item = -1;  /* ContextCombination */
-static int hf_x509if_contextcombination_or = -1;  /* SEQUNCE_OF_ContextCombination */
+static int hf_x509if_contextcombination_or = -1;  /* SEQUENCE_OF_ContextCombination */
 static int hf_x509if_contextcombination_or_item = -1;  /* ContextCombination */
 static int hf_x509if_contextcombination_not = -1;  /* ContextCombination */
 static int hf_x509if_restrictionType = -1;        /* AttributeId */
 static int hf_x509if_restrictionValue = -1;       /* AttributeValue */
 static int hf_x509if_attribute = -1;              /* AttributeType */
-static int hf_x509if_and = -1;                    /* SEQUNCE_OF_AttributeCombination */
+static int hf_x509if_and = -1;                    /* SEQUENCE_OF_AttributeCombination */
 static int hf_x509if_and_item = -1;               /* AttributeCombination */
-static int hf_x509if_or = -1;                     /* SEQUNCE_OF_AttributeCombination */
+static int hf_x509if_or = -1;                     /* SEQUENCE_OF_AttributeCombination */
 static int hf_x509if_or_item = -1;                /* AttributeCombination */
 static int hf_x509if_not = -1;                    /* AttributeCombination */
 static int hf_x509if_outputValues = -1;           /* T_outputValues */
-static int hf_x509if_selectedValues = -1;         /* SEQUNCE_OF_AttributeValue */
+static int hf_x509if_selectedValues = -1;         /* SEQUENCE_OF_AttributeValue */
 static int hf_x509if_selectedValues_item = -1;    /* AttributeValue */
 static int hf_x509if_matchedValuesOnly = -1;      /* NULL */
 static int hf_x509if_default = -1;                /* INTEGER */
 static int hf_x509if_max = -1;                    /* INTEGER */
 static int hf_x509if_basic = -1;                  /* MRMapping */
-static int hf_x509if_tightenings = -1;            /* SEQUNCE_OF_MRMapping */
+static int hf_x509if_tightenings = -1;            /* SEQUENCE_OF_MRMapping */
 static int hf_x509if_tightenings_item = -1;       /* MRMapping */
-static int hf_x509if_relaxations = -1;            /* SEQUNCE_OF_MRMapping */
+static int hf_x509if_relaxations = -1;            /* SEQUENCE_OF_MRMapping */
 static int hf_x509if_relaxations_item = -1;       /* MRMapping */
 static int hf_x509if_maximum_relaxation = -1;     /* INTEGER */
 static int hf_x509if_minimum_relaxation = -1;     /* INTEGER */
-static int hf_x509if_mapping = -1;                /* SEQUNCE_OF_Mapping */
+static int hf_x509if_mapping = -1;                /* SEQUENCE_OF_Mapping */
 static int hf_x509if_mapping_item = -1;           /* Mapping */
-static int hf_x509if_substitution = -1;           /* SEQUNCE_OF_MRSubstitution */
+static int hf_x509if_substitution = -1;           /* SEQUENCE_OF_MRSubstitution */
 static int hf_x509if_substitution_item = -1;      /* MRSubstitution */
 static int hf_x509if_mappingFunction = -1;        /* OBJECT_IDENTIFIER */
 static int hf_x509if_level = -1;                  /* INTEGER */
@@ -214,7 +214,7 @@ static gint ett_x509if_SET_OF_ContextAssertion = -1;
 static gint ett_x509if_ContextAssertion = -1;
 static gint ett_x509if_SET_OF_ContextValue = -1;
 static gint ett_x509if_AttributeTypeAssertion = -1;
-static gint ett_x509if_SEQUNCE_OF_ContextAssertion = -1;
+static gint ett_x509if_SEQUENCE_OF_ContextAssertion = -1;
 static gint ett_x509if_Name = -1;
 static gint ett_x509if_RDNSequence = -1;
 static gint ett_x509if_RelativeDistinguishedName = -1;
@@ -232,41 +232,43 @@ static gint ett_x509if_SET_OF_Refinement = -1;
 static gint ett_x509if_DITStructureRule = -1;
 static gint ett_x509if_SET_OF_RuleIdentifier = -1;
 static gint ett_x509if_DITContentRule = -1;
-static gint ett_x509if_SET_OF_OBJECT_IDENTIFIER = -1;
+static gint ett_x509if_T_auxiliaries = -1;
 static gint ett_x509if_SET_SIZE_1_MAX_OF_AttributeId = -1;
 static gint ett_x509if_DITContextUse = -1;
+static gint ett_x509if_T_mandatoryContexts = -1;
+static gint ett_x509if_T_optionalContexts = -1;
 static gint ett_x509if_SearchRuleDescription = -1;
-static gint ett_x509if_SEQUNCE_OF_RequestAttribute = -1;
-static gint ett_x509if_SEQUNCE_OF_ResultAttribute = -1;
-static gint ett_x509if_SEQUNCE_OF_AttributeType = -1;
+static gint ett_x509if_SEQUENCE_OF_RequestAttribute = -1;
+static gint ett_x509if_SEQUENCE_OF_ResultAttribute = -1;
+static gint ett_x509if_SEQUENCE_OF_AttributeType = -1;
 static gint ett_x509if_SET_OF_DirectoryString = -1;
 static gint ett_x509if_SearchRule = -1;
 static gint ett_x509if_SearchRuleId = -1;
 static gint ett_x509if_AllowedSubset = -1;
 static gint ett_x509if_RequestAttribute = -1;
-static gint ett_x509if_SEQUNCE_OF_SelectedValues = -1;
+static gint ett_x509if_SEQUENCE_OF_SelectedValues = -1;
 static gint ett_x509if_T_defaultValues = -1;
 static gint ett_x509if_T_defaultValues_item = -1;
-static gint ett_x509if_SEQUNCE_OF_DefaultValueValues = -1;
-static gint ett_x509if_SEQUNCE_OF_ContextProfile = -1;
-static gint ett_x509if_SEQUNCE_OF_MatchingUse = -1;
+static gint ett_x509if_SEQUENCE_OF_DefaultValueValues = -1;
+static gint ett_x509if_SEQUENCE_OF_ContextProfile = -1;
+static gint ett_x509if_SEQUENCE_OF_MatchingUse = -1;
 static gint ett_x509if_ContextProfile = -1;
-static gint ett_x509if_SEQUNCE_OF_AttributeValue = -1;
+static gint ett_x509if_SEQUENCE_OF_AttributeValue = -1;
 static gint ett_x509if_ContextCombination = -1;
-static gint ett_x509if_SEQUNCE_OF_ContextCombination = -1;
+static gint ett_x509if_SEQUENCE_OF_ContextCombination = -1;
 static gint ett_x509if_MatchingUse = -1;
 static gint ett_x509if_AttributeCombination = -1;
-static gint ett_x509if_SEQUNCE_OF_AttributeCombination = -1;
+static gint ett_x509if_SEQUENCE_OF_AttributeCombination = -1;
 static gint ett_x509if_ResultAttribute = -1;
 static gint ett_x509if_T_outputValues = -1;
 static gint ett_x509if_OutputValues = -1;
 static gint ett_x509if_ControlOptions = -1;
 static gint ett_x509if_EntryLimit = -1;
 static gint ett_x509if_RelaxationPolicy = -1;
-static gint ett_x509if_SEQUNCE_OF_MRMapping = -1;
+static gint ett_x509if_SEQUENCE_OF_MRMapping = -1;
 static gint ett_x509if_MRMapping = -1;
-static gint ett_x509if_SEQUNCE_OF_Mapping = -1;
-static gint ett_x509if_SEQUNCE_OF_MRSubstitution = -1;
+static gint ett_x509if_SEQUENCE_OF_Mapping = -1;
+static gint ett_x509if_SEQUENCE_OF_MRSubstitution = -1;
 static gint ett_x509if_Mapping = -1;
 static gint ett_x509if_MRSubstitution = -1;
 
@@ -440,7 +442,7 @@ static int dissect_contextValues(packet_info *pinfo, proto_tree *tree, tvbuff_t
 
 static int
 dissect_x509if_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
 
   return offset;
 }
@@ -645,7 +647,7 @@ static int dissect_selectedContexts(packet_info *pinfo, proto_tree *tree, tvbuff
 }
 
 
-static const value_string T_assertedContexts_vals[] = {
+static const value_string x509if_T_assertedContexts_vals[] = {
   {   0, "allContexts" },
   {   1, "selectedContexts" },
   { 0, NULL }
@@ -683,19 +685,19 @@ dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb,
   return offset;
 }
 
-static const ber_sequence_t SEQUNCE_OF_ContextAssertion_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_ContextAssertion_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_assertedContexts_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_ContextAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_ContextAssertion_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_ContextAssertion);
+                                   SEQUENCE_OF_ContextAssertion_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextAssertion);
 
   return offset;
 }
 static int dissect_ata_assertedContexts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_ata_assertedContexts);
+  return dissect_x509if_SEQUENCE_OF_ContextAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509if_ata_assertedContexts);
 }
 
 static const ber_sequence_t AttributeTypeAssertion_sequence[] = {
@@ -794,7 +796,7 @@ static int dissect_rdnSequence(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 }
 
 
-const value_string Name_vals[] = {
+const value_string x509if_Name_vals[] = {
   {   0, "rdnSequence" },
   { 0, NULL }
 };
@@ -838,7 +840,7 @@ static int dissect_chopAfter(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 }
 
 
-static const value_string T_specificExclusions_item_vals[] = {
+static const value_string x509if_T_specificExclusions_item_vals[] = {
   {   0, "chopBefore" },
   {   1, "chopAfter" },
   { 0, NULL }
@@ -955,7 +957,7 @@ static int dissect_refinement_or(packet_info *pinfo, proto_tree *tree, tvbuff_t
 }
 
 
-const value_string Refinement_vals[] = {
+const value_string x509if_Refinement_vals[] = {
   {   0, "item" },
   {   1, "and" },
   {   2, "or" },
@@ -997,7 +999,7 @@ dissect_x509if_SubtreeSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, in
 }
 
 
-static const value_string T_chopSpecificExclusions_item_vals[] = {
+static const value_string x509if_T_chopSpecificExclusions_item_vals[] = {
   {   0, "chopBefore" },
   {   1, "chopAfter" },
   { 0, NULL }
@@ -1051,7 +1053,7 @@ dissect_x509if_ChopSpecification(gboolean implicit_tag _U_, tvbuff_t *tvb, int o
 }
 
 
-static const value_string ObjectClassKind_vals[] = {
+static const value_string x509if_ObjectClassKind_vals[] = {
   {   0, "abstract" },
   {   1, "structural" },
   {   2, "auxiliary" },
@@ -1067,7 +1069,7 @@ dissect_x509if_ObjectClassKind(gboolean implicit_tag _U_, tvbuff_t *tvb, int off
 }
 
 
-const value_string AttributeUsage_vals[] = {
+const value_string x509if_AttributeUsage_vals[] = {
   {   0, "userApplications" },
   {   1, "directoryOperation" },
   {   2, "distributedOperation" },
@@ -1128,25 +1130,19 @@ dissect_x509if_DITStructureRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int of
   return offset;
 }
 
-static const ber_sequence_t SET_OF_OBJECT_IDENTIFIER_set_of[1] = {
+static const ber_sequence_t T_auxiliaries_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_auxiliaries_item },
 };
 
 static int
-dissect_x509if_SET_OF_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_T_auxiliaries(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
-                              SET_OF_OBJECT_IDENTIFIER_set_of, hf_index, ett_x509if_SET_OF_OBJECT_IDENTIFIER);
+                              T_auxiliaries_set_of, hf_index, ett_x509if_T_auxiliaries);
 
   return offset;
 }
 static int dissect_auxiliaries(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SET_OF_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509if_auxiliaries);
-}
-static int dissect_mandatoryContexts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SET_OF_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509if_mandatoryContexts);
-}
-static int dissect_optionalContexts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SET_OF_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509if_optionalContexts);
+  return dissect_x509if_T_auxiliaries(FALSE, tvb, offset, pinfo, tree, hf_x509if_auxiliaries);
 }
 
 static const ber_sequence_t SET_SIZE_1_MAX_OF_AttributeId_set_of[1] = {
@@ -1187,6 +1183,36 @@ dissect_x509if_DITContentRule(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
   return offset;
 }
 
+static const ber_sequence_t T_mandatoryContexts_set_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_mandatoryContexts_item },
+};
+
+static int
+dissect_x509if_T_mandatoryContexts(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
+                              T_mandatoryContexts_set_of, hf_index, ett_x509if_T_mandatoryContexts);
+
+  return offset;
+}
+static int dissect_mandatoryContexts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_x509if_T_mandatoryContexts(FALSE, tvb, offset, pinfo, tree, hf_x509if_mandatoryContexts);
+}
+
+static const ber_sequence_t T_optionalContexts_set_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_optionalContexts_item },
+};
+
+static int
+dissect_x509if_T_optionalContexts(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
+                              T_optionalContexts_set_of, hf_index, ett_x509if_T_optionalContexts);
+
+  return offset;
+}
+static int dissect_optionalContexts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_x509if_T_optionalContexts(FALSE, tvb, offset, pinfo, tree, hf_x509if_optionalContexts);
+}
+
 static const ber_sequence_t DITContextUse_sequence[] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_attributeType },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_mandatoryContexts },
@@ -1245,19 +1271,19 @@ static int dissect_ra_selectedValues_item(packet_info *pinfo, proto_tree *tree,
   return dissect_x509if_SelectedValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_ra_selectedValues_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_SelectedValues_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_SelectedValues_sequence_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ra_selectedValues_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_SelectedValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_SelectedValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_SelectedValues_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_SelectedValues);
+                                   SEQUENCE_OF_SelectedValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_SelectedValues);
 
   return offset;
 }
 static int dissect_ra_selectedValues(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_SelectedValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_ra_selectedValues);
+  return dissect_x509if_SEQUENCE_OF_SelectedValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_ra_selectedValues);
 }
 
 
@@ -1286,19 +1312,19 @@ static int dissect_ra_values_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_x509if_DefaultValueValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_ra_values_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_DefaultValueValues_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_DefaultValueValues_sequence_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_ra_values_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_DefaultValueValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_DefaultValueValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_DefaultValueValues_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_DefaultValueValues);
+                                   SEQUENCE_OF_DefaultValueValues_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_DefaultValueValues);
 
   return offset;
 }
 static int dissect_ra_values(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_DefaultValueValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_ra_values);
+  return dissect_x509if_SEQUENCE_OF_DefaultValueValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_ra_values);
 }
 
 static const ber_sequence_t T_defaultValues_item_sequence[] = {
@@ -1333,22 +1359,22 @@ static int dissect_defaultValues(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_x509if_T_defaultValues(FALSE, tvb, offset, pinfo, tree, hf_x509if_defaultValues);
 }
 
-static const ber_sequence_t SEQUNCE_OF_AttributeValue_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_AttributeValue_sequence_of[1] = {
   { BER_CLASS_ANY, 0, BER_FLAGS_NOOWNTAG, dissect_contextValue_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_AttributeValue_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_AttributeValue);
+                                   SEQUENCE_OF_AttributeValue_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeValue);
 
   return offset;
 }
 static int dissect_contextValue(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_AttributeValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextValue);
+  return dissect_x509if_SEQUENCE_OF_AttributeValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextValue);
 }
 static int dissect_selectedValues(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_AttributeValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_selectedValues);
+  return dissect_x509if_SEQUENCE_OF_AttributeValue(FALSE, tvb, offset, pinfo, tree, hf_x509if_selectedValues);
 }
 
 static const ber_sequence_t ContextProfile_sequence[] = {
@@ -1368,41 +1394,41 @@ static int dissect_contexts_item(packet_info *pinfo, proto_tree *tree, tvbuff_t
   return dissect_x509if_ContextProfile(FALSE, tvb, offset, pinfo, tree, hf_x509if_contexts_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_ContextProfile_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_ContextProfile_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_contexts_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_ContextProfile(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_ContextProfile(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_ContextProfile_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_ContextProfile);
+                                   SEQUENCE_OF_ContextProfile_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextProfile);
 
   return offset;
 }
 static int dissect_contexts(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_ContextProfile(FALSE, tvb, offset, pinfo, tree, hf_x509if_contexts);
+  return dissect_x509if_SEQUENCE_OF_ContextProfile(FALSE, tvb, offset, pinfo, tree, hf_x509if_contexts);
 }
 
-static const ber_sequence_t SEQUNCE_OF_ContextCombination_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_ContextCombination_sequence_of[1] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_contextcombination_and_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_ContextCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_ContextCombination_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_ContextCombination);
+                                   SEQUENCE_OF_ContextCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ContextCombination);
 
   return offset;
 }
 static int dissect_contextcombination_and(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_ContextCombination(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextcombination_and);
+  return dissect_x509if_SEQUENCE_OF_ContextCombination(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextcombination_and);
 }
 static int dissect_contextcombination_or(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_ContextCombination(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextcombination_or);
+  return dissect_x509if_SEQUENCE_OF_ContextCombination(FALSE, tvb, offset, pinfo, tree, hf_x509if_contextcombination_or);
 }
 
 
-const value_string ContextCombination_vals[] = {
+const value_string x509if_ContextCombination_vals[] = {
   {   0, "context" },
   {   1, "and" },
   {   2, "or" },
@@ -1443,19 +1469,19 @@ static int dissect_matchingUse_item(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_x509if_MatchingUse(FALSE, tvb, offset, pinfo, tree, hf_x509if_matchingUse_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_MatchingUse_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_MatchingUse_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_matchingUse_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_MatchingUse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_MatchingUse(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_MatchingUse_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_MatchingUse);
+                                   SEQUENCE_OF_MatchingUse_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MatchingUse);
 
   return offset;
 }
 static int dissect_matchingUse(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_MatchingUse(FALSE, tvb, offset, pinfo, tree, hf_x509if_matchingUse);
+  return dissect_x509if_SEQUENCE_OF_MatchingUse(FALSE, tvb, offset, pinfo, tree, hf_x509if_matchingUse);
 }
 
 static const ber_sequence_t RequestAttribute_sequence[] = {
@@ -1480,41 +1506,41 @@ static int dissect_inputAttributeTypes_item(packet_info *pinfo, proto_tree *tree
   return dissect_x509if_RequestAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_inputAttributeTypes_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_RequestAttribute_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_RequestAttribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_inputAttributeTypes_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_RequestAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_RequestAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_RequestAttribute_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_RequestAttribute);
+                                   SEQUENCE_OF_RequestAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_RequestAttribute);
 
   return offset;
 }
 static int dissect_inputAttributeTypes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_RequestAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_inputAttributeTypes);
+  return dissect_x509if_SEQUENCE_OF_RequestAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_inputAttributeTypes);
 }
 
-static const ber_sequence_t SEQUNCE_OF_AttributeCombination_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_AttributeCombination_sequence_of[1] = {
   { BER_CLASS_CON, -1/*choice*/, BER_FLAGS_NOOWNTAG|BER_FLAGS_NOTCHKTAG, dissect_and_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_AttributeCombination_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_AttributeCombination);
+                                   SEQUENCE_OF_AttributeCombination_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeCombination);
 
   return offset;
 }
 static int dissect_and(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_AttributeCombination(FALSE, tvb, offset, pinfo, tree, hf_x509if_and);
+  return dissect_x509if_SEQUENCE_OF_AttributeCombination(FALSE, tvb, offset, pinfo, tree, hf_x509if_and);
 }
 static int dissect_or(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_AttributeCombination(FALSE, tvb, offset, pinfo, tree, hf_x509if_or);
+  return dissect_x509if_SEQUENCE_OF_AttributeCombination(FALSE, tvb, offset, pinfo, tree, hf_x509if_or);
 }
 
 
-const value_string AttributeCombination_vals[] = {
+const value_string x509if_AttributeCombination_vals[] = {
   {   0, "attribute" },
   {   1, "and" },
   {   2, "or" },
@@ -1539,7 +1565,7 @@ dissect_x509if_AttributeCombination(gboolean implicit_tag _U_, tvbuff_t *tvb, in
 }
 
 
-static const value_string T_outputValues_vals[] = {
+static const value_string x509if_T_outputValues_vals[] = {
   {   0, "selectedValues" },
   {   1, "matchedValuesOnly" },
   { 0, NULL }
@@ -1580,19 +1606,19 @@ static int dissect_outputAttributeTypes_item(packet_info *pinfo, proto_tree *tre
   return dissect_x509if_ResultAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputAttributeTypes_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_ResultAttribute_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_ResultAttribute_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_outputAttributeTypes_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_ResultAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_ResultAttribute(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_ResultAttribute_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_ResultAttribute);
+                                   SEQUENCE_OF_ResultAttribute_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_ResultAttribute);
 
   return offset;
 }
 static int dissect_outputAttributeTypes(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_ResultAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputAttributeTypes);
+  return dissect_x509if_SEQUENCE_OF_ResultAttribute(FALSE, tvb, offset, pinfo, tree, hf_x509if_outputAttributeTypes);
 }
 
 static const ber_sequence_t ControlOptions_sequence[] = {
@@ -1633,19 +1659,19 @@ static int dissect_mapping_item(packet_info *pinfo, proto_tree *tree, tvbuff_t *
   return dissect_x509if_Mapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_mapping_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_Mapping_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_Mapping_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_mapping_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_Mapping(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_Mapping(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_Mapping_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_Mapping);
+                                   SEQUENCE_OF_Mapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_Mapping);
 
   return offset;
 }
 static int dissect_mapping(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_Mapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_mapping);
+  return dissect_x509if_SEQUENCE_OF_Mapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_mapping);
 }
 
 static const ber_sequence_t MRSubstitution_sequence[] = {
@@ -1666,19 +1692,19 @@ static int dissect_substitution_item(packet_info *pinfo, proto_tree *tree, tvbuf
   return dissect_x509if_MRSubstitution(FALSE, tvb, offset, pinfo, tree, hf_x509if_substitution_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_MRSubstitution_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_MRSubstitution_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_substitution_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_MRSubstitution(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_MRSubstitution(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_MRSubstitution_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_MRSubstitution);
+                                   SEQUENCE_OF_MRSubstitution_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRSubstitution);
 
   return offset;
 }
 static int dissect_substitution(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_MRSubstitution(FALSE, tvb, offset, pinfo, tree, hf_x509if_substitution);
+  return dissect_x509if_SEQUENCE_OF_MRSubstitution(FALSE, tvb, offset, pinfo, tree, hf_x509if_substitution);
 }
 
 static const ber_sequence_t MRMapping_sequence[] = {
@@ -1704,22 +1730,22 @@ static int dissect_relaxations_item(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_x509if_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxations_item);
 }
 
-static const ber_sequence_t SEQUNCE_OF_MRMapping_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_MRMapping_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_tightenings_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_MRMapping(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_MRMapping(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_MRMapping_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_MRMapping);
+                                   SEQUENCE_OF_MRMapping_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_MRMapping);
 
   return offset;
 }
 static int dissect_tightenings(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_tightenings);
+  return dissect_x509if_SEQUENCE_OF_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_tightenings);
 }
 static int dissect_relaxations(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxations);
+  return dissect_x509if_SEQUENCE_OF_MRMapping(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxations);
 }
 
 static const ber_sequence_t RelaxationPolicy_sequence[] = {
@@ -1742,19 +1768,19 @@ static int dissect_relaxation(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
   return dissect_x509if_RelaxationPolicy(FALSE, tvb, offset, pinfo, tree, hf_x509if_relaxation);
 }
 
-static const ber_sequence_t SEQUNCE_OF_AttributeType_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_AttributeType_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_additionalControl_item },
 };
 
 static int
-dissect_x509if_SEQUNCE_OF_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509if_SEQUENCE_OF_AttributeType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_AttributeType_sequence_of, hf_index, ett_x509if_SEQUNCE_OF_AttributeType);
+                                   SEQUENCE_OF_AttributeType_sequence_of, hf_index, ett_x509if_SEQUENCE_OF_AttributeType);
 
   return offset;
 }
 static int dissect_additionalControl(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509if_SEQUNCE_OF_AttributeType(FALSE, tvb, offset, pinfo, tree, hf_x509if_additionalControl);
+  return dissect_x509if_SEQUENCE_OF_AttributeType(FALSE, tvb, offset, pinfo, tree, hf_x509if_additionalControl);
 }
 
 static const asn_namedbit AllowedSubset_bits[] = {
@@ -1777,7 +1803,7 @@ static int dissect_allowedSubset(packet_info *pinfo, proto_tree *tree, tvbuff_t
 }
 
 
-const value_string ImposedSubset_vals[] = {
+const value_string x509if_ImposedSubset_vals[] = {
   {   0, "baseObject" },
   {   1, "oneLevel" },
   {   2, "wholeSubtree" },
@@ -1899,7 +1925,7 @@ dissect_x509if_SearchRuleId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
 }
 
 
-const value_string OutputValues_vals[] = {
+const value_string x509if_OutputValues_vals[] = {
   {   0, "selectedValues" },
   {   1, "matchedValuesOnly" },
   { 0, NULL }
@@ -1990,7 +2016,7 @@ void proto_register_x509if(void) {
         "AttributeValueAssertion/assertion", HFILL }},
     { &hf_x509if_assertedContexts,
       { "assertedContexts", "x509if.assertedContexts",
-        FT_UINT32, BASE_DEC, VALS(T_assertedContexts_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_T_assertedContexts_vals), 0,
         "AttributeValueAssertion/assertedContexts", HFILL }},
     { &hf_x509if_allContexts,
       { "allContexts", "x509if.allContexts",
@@ -2066,7 +2092,7 @@ void proto_register_x509if(void) {
         "SubtreeSpecification/specificExclusions", HFILL }},
     { &hf_x509if_specificExclusions_item,
       { "Item", "x509if.specificExclusions_item",
-        FT_UINT32, BASE_DEC, VALS(T_specificExclusions_item_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_T_specificExclusions_item_vals), 0,
         "SubtreeSpecification/specificExclusions/_item", HFILL }},
     { &hf_x509if_chopBefore,
       { "chopBefore", "x509if.chopBefore",
@@ -2086,7 +2112,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_specificationFilter,
       { "specificationFilter", "x509if.specificationFilter",
-        FT_UINT32, BASE_DEC, VALS(Refinement_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Refinement_vals), 0,
         "SubtreeSpecification/specificationFilter", HFILL }},
     { &hf_x509if_chopSpecificExclusions,
       { "specificExclusions", "x509if.specificExclusions",
@@ -2094,7 +2120,7 @@ void proto_register_x509if(void) {
         "ChopSpecification/specificExclusions", HFILL }},
     { &hf_x509if_chopSpecificExclusions_item,
       { "Item", "x509if.specificExclusions_item",
-        FT_UINT32, BASE_DEC, VALS(T_chopSpecificExclusions_item_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_T_chopSpecificExclusions_item_vals), 0,
         "ChopSpecification/specificExclusions/_item", HFILL }},
     { &hf_x509if_item,
       { "item", "x509if.item",
@@ -2106,7 +2132,7 @@ void proto_register_x509if(void) {
         "Refinement/and", HFILL }},
     { &hf_x509if_refinement_and_item,
       { "Item", "x509if.and_item",
-        FT_UINT32, BASE_DEC, VALS(Refinement_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Refinement_vals), 0,
         "Refinement/and/_item", HFILL }},
     { &hf_x509if_refinement_or,
       { "or", "x509if.or",
@@ -2114,11 +2140,11 @@ void proto_register_x509if(void) {
         "Refinement/or", HFILL }},
     { &hf_x509if_refinement_or_item,
       { "Item", "x509if.or_item",
-        FT_UINT32, BASE_DEC, VALS(Refinement_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Refinement_vals), 0,
         "Refinement/or/_item", HFILL }},
     { &hf_x509if_refinement_not,
       { "not", "x509if.not",
-        FT_UINT32, BASE_DEC, VALS(Refinement_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_Refinement_vals), 0,
         "Refinement/not", HFILL }},
     { &hf_x509if_ruleIdentifier,
       { "ruleIdentifier", "x509if.ruleIdentifier",
@@ -2218,7 +2244,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_attributeCombination,
       { "attributeCombination", "x509if.attributeCombination",
-        FT_UINT32, BASE_DEC, VALS(AttributeCombination_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_AttributeCombination_vals), 0,
         "", HFILL }},
     { &hf_x509if_outputAttributeTypes,
       { "outputAttributeTypes", "x509if.outputAttributeTypes",
@@ -2258,7 +2284,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_imposedSubset,
       { "imposedSubset", "x509if.imposedSubset",
-        FT_UINT32, BASE_DEC, VALS(ImposedSubset_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_ImposedSubset_vals), 0,
         "", HFILL }},
     { &hf_x509if_entryLimit,
       { "entryLimit", "x509if.entryLimit",
@@ -2322,7 +2348,7 @@ void proto_register_x509if(void) {
         "", HFILL }},
     { &hf_x509if_contextCombination,
       { "contextCombination", "x509if.contextCombination",
-        FT_UINT32, BASE_DEC, VALS(ContextCombination_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_ContextCombination_vals), 0,
         "RequestAttribute/contextCombination", HFILL }},
     { &hf_x509if_matchingUse,
       { "matchingUse", "x509if.matchingUse",
@@ -2350,7 +2376,7 @@ void proto_register_x509if(void) {
         "ContextCombination/and", HFILL }},
     { &hf_x509if_contextcombination_and_item,
       { "Item", "x509if.and_item",
-        FT_UINT32, BASE_DEC, VALS(ContextCombination_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_ContextCombination_vals), 0,
         "ContextCombination/and/_item", HFILL }},
     { &hf_x509if_contextcombination_or,
       { "or", "x509if.or",
@@ -2358,11 +2384,11 @@ void proto_register_x509if(void) {
         "ContextCombination/or", HFILL }},
     { &hf_x509if_contextcombination_or_item,
       { "Item", "x509if.or_item",
-        FT_UINT32, BASE_DEC, VALS(ContextCombination_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_ContextCombination_vals), 0,
         "ContextCombination/or/_item", HFILL }},
     { &hf_x509if_contextcombination_not,
       { "not", "x509if.not",
-        FT_UINT32, BASE_DEC, VALS(ContextCombination_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_ContextCombination_vals), 0,
         "ContextCombination/not", HFILL }},
     { &hf_x509if_restrictionType,
       { "restrictionType", "x509if.restrictionType",
@@ -2382,7 +2408,7 @@ void proto_register_x509if(void) {
         "AttributeCombination/and", HFILL }},
     { &hf_x509if_and_item,
       { "Item", "x509if.and_item",
-        FT_UINT32, BASE_DEC, VALS(AttributeCombination_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_AttributeCombination_vals), 0,
         "AttributeCombination/and/_item", HFILL }},
     { &hf_x509if_or,
       { "or", "x509if.or",
@@ -2390,15 +2416,15 @@ void proto_register_x509if(void) {
         "AttributeCombination/or", HFILL }},
     { &hf_x509if_or_item,
       { "Item", "x509if.or_item",
-        FT_UINT32, BASE_DEC, VALS(AttributeCombination_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_AttributeCombination_vals), 0,
         "AttributeCombination/or/_item", HFILL }},
     { &hf_x509if_not,
       { "not", "x509if.not",
-        FT_UINT32, BASE_DEC, VALS(AttributeCombination_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_AttributeCombination_vals), 0,
         "AttributeCombination/not", HFILL }},
     { &hf_x509if_outputValues,
       { "outputValues", "x509if.outputValues",
-        FT_UINT32, BASE_DEC, VALS(T_outputValues_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509if_T_outputValues_vals), 0,
         "ResultAttribute/outputValues", HFILL }},
     { &hf_x509if_selectedValues,
       { "selectedValues", "x509if.selectedValues",
@@ -2514,7 +2540,7 @@ void proto_register_x509if(void) {
     &ett_x509if_ContextAssertion,
     &ett_x509if_SET_OF_ContextValue,
     &ett_x509if_AttributeTypeAssertion,
-    &ett_x509if_SEQUNCE_OF_ContextAssertion,
+    &ett_x509if_SEQUENCE_OF_ContextAssertion,
     &ett_x509if_Name,
     &ett_x509if_RDNSequence,
     &ett_x509if_RelativeDistinguishedName,
@@ -2532,41 +2558,43 @@ void proto_register_x509if(void) {
     &ett_x509if_DITStructureRule,
     &ett_x509if_SET_OF_RuleIdentifier,
     &ett_x509if_DITContentRule,
-    &ett_x509if_SET_OF_OBJECT_IDENTIFIER,
+    &ett_x509if_T_auxiliaries,
     &ett_x509if_SET_SIZE_1_MAX_OF_AttributeId,
     &ett_x509if_DITContextUse,
+    &ett_x509if_T_mandatoryContexts,
+    &ett_x509if_T_optionalContexts,
     &ett_x509if_SearchRuleDescription,
-    &ett_x509if_SEQUNCE_OF_RequestAttribute,
-    &ett_x509if_SEQUNCE_OF_ResultAttribute,
-    &ett_x509if_SEQUNCE_OF_AttributeType,
+    &ett_x509if_SEQUENCE_OF_RequestAttribute,
+    &ett_x509if_SEQUENCE_OF_ResultAttribute,
+    &ett_x509if_SEQUENCE_OF_AttributeType,
     &ett_x509if_SET_OF_DirectoryString,
     &ett_x509if_SearchRule,
     &ett_x509if_SearchRuleId,
     &ett_x509if_AllowedSubset,
     &ett_x509if_RequestAttribute,
-    &ett_x509if_SEQUNCE_OF_SelectedValues,
+    &ett_x509if_SEQUENCE_OF_SelectedValues,
     &ett_x509if_T_defaultValues,
     &ett_x509if_T_defaultValues_item,
-    &ett_x509if_SEQUNCE_OF_DefaultValueValues,
-    &ett_x509if_SEQUNCE_OF_ContextProfile,
-    &ett_x509if_SEQUNCE_OF_MatchingUse,
+    &ett_x509if_SEQUENCE_OF_DefaultValueValues,
+    &ett_x509if_SEQUENCE_OF_ContextProfile,
+    &ett_x509if_SEQUENCE_OF_MatchingUse,
     &ett_x509if_ContextProfile,
-    &ett_x509if_SEQUNCE_OF_AttributeValue,
+    &ett_x509if_SEQUENCE_OF_AttributeValue,
     &ett_x509if_ContextCombination,
-    &ett_x509if_SEQUNCE_OF_ContextCombination,
+    &ett_x509if_SEQUENCE_OF_ContextCombination,
     &ett_x509if_MatchingUse,
     &ett_x509if_AttributeCombination,
-    &ett_x509if_SEQUNCE_OF_AttributeCombination,
+    &ett_x509if_SEQUENCE_OF_AttributeCombination,
     &ett_x509if_ResultAttribute,
     &ett_x509if_T_outputValues,
     &ett_x509if_OutputValues,
     &ett_x509if_ControlOptions,
     &ett_x509if_EntryLimit,
     &ett_x509if_RelaxationPolicy,
-    &ett_x509if_SEQUNCE_OF_MRMapping,
+    &ett_x509if_SEQUENCE_OF_MRMapping,
     &ett_x509if_MRMapping,
-    &ett_x509if_SEQUNCE_OF_Mapping,
-    &ett_x509if_SEQUNCE_OF_MRSubstitution,
+    &ett_x509if_SEQUENCE_OF_Mapping,
+    &ett_x509if_SEQUENCE_OF_MRSubstitution,
     &ett_x509if_Mapping,
     &ett_x509if_MRSubstitution,
 
index a3804ac5bb4a943783f23d7cf3bb93a469d9e594..01e482fc7e97445fcebb68ebbf1279ee5a91fa5c 100644 (file)
 
 /*--- Included file: packet-x509if-exp.h ---*/
 
-extern const value_string Name_vals[];
-extern const value_string Refinement_vals[];
-extern const value_string AttributeUsage_vals[];
-extern const value_string ImposedSubset_vals[];
-extern const value_string ContextCombination_vals[];
-extern const value_string AttributeCombination_vals[];
-extern const value_string OutputValues_vals[];
+extern const value_string x509if_Name_vals[];
+extern const value_string x509if_Refinement_vals[];
+extern const value_string x509if_AttributeUsage_vals[];
+extern const value_string x509if_ImposedSubset_vals[];
+extern const value_string x509if_ContextCombination_vals[];
+extern const value_string x509if_AttributeCombination_vals[];
+extern const value_string x509if_OutputValues_vals[];
 int dissect_x509if_Attribute(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_x509if_AttributeType(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_x509if_Context(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
index 8fdc9ff59709f9fb47c6eab7016b35d0022376a5..9a756c8c6416220f4ff726a4a7c80f3c5928ca90 100644 (file)
@@ -9,7 +9,7 @@
  * Routines for X.509 Selected Attribute Types packet dissection
  *  Ronnie Sahlberg 2004
  *
- * $Id: packet-x509sat-template.c 12573 2004-11-22 03:36:26Z sahlberg $
+ * $Id: packet-x509sat-template.c 12743 2004-12-13 11:59:48Z sahlberg $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -81,15 +81,15 @@ static int hf_x509sat_PreferredDeliveryMethod_item = -1;  /* PreferredDeliveryMe
 static int hf_x509sat_pSelector = -1;             /* OCTET_STRING */
 static int hf_x509sat_sSelector = -1;             /* OCTET_STRING */
 static int hf_x509sat_tSelector = -1;             /* OCTET_STRING */
-static int hf_x509sat_nAddresses = -1;            /* SET_OF_OCTET_STRING */
+static int hf_x509sat_nAddresses = -1;            /* T_nAddresses */
 static int hf_x509sat_nAddresses_item = -1;       /* OCTET_STRING */
 static int hf_x509sat_nAddress = -1;              /* OCTET_STRING */
-static int hf_x509sat_profiles = -1;              /* SET_OF_OBJECT_IDENTIFIER */
+static int hf_x509sat_profiles = -1;              /* T_profiles */
 static int hf_x509sat_profiles_item = -1;         /* OBJECT_IDENTIFIER */
 static int hf_x509sat_dn = -1;                    /* DistinguishedName */
 static int hf_x509sat_uid = -1;                   /* UniqueIdentifier */
 static int hf_x509sat_matchingRuleUsed = -1;      /* OBJECT_IDENTIFIER */
-static int hf_x509sat_attributeList = -1;         /* SEQUNCE_OF_AttributeValueAssertion */
+static int hf_x509sat_attributeList = -1;         /* SEQUENCE_OF_AttributeValueAssertion */
 static int hf_x509sat_attributeList_item = -1;    /* AttributeValueAssertion */
 static int hf_x509sat_SubstringAssertion_item = -1;  /* SubstringAssertion_item */
 static int hf_x509sat_initial = -1;               /* DirectoryString */
@@ -113,21 +113,21 @@ static int hf_x509sat_timeZone = -1;              /* TimeZone */
 static int hf_x509sat_timesOfDay = -1;            /* SET_OF_DayTimeBand */
 static int hf_x509sat_timesOfDay_item = -1;       /* DayTimeBand */
 static int hf_x509sat_days = -1;                  /* T_days */
-static int hf_x509sat_intDay = -1;                /* SET_OF_INTEGER */
+static int hf_x509sat_intDay = -1;                /* T_intDay */
 static int hf_x509sat_intDay_item = -1;           /* INTEGER */
 static int hf_x509sat_bitDay = -1;                /* T_bitDay */
 static int hf_x509sat_dayOf = -1;                 /* XDayOf */
 static int hf_x509sat_weeks = -1;                 /* T_weeks */
 static int hf_x509sat_allWeeks = -1;              /* NULL */
-static int hf_x509sat_intWeek = -1;               /* SET_OF_INTEGER */
+static int hf_x509sat_intWeek = -1;               /* T_intWeek */
 static int hf_x509sat_intWeek_item = -1;          /* INTEGER */
 static int hf_x509sat_bitWeek = -1;               /* T_bitWeek */
 static int hf_x509sat_months = -1;                /* T_months */
 static int hf_x509sat_allMonths = -1;             /* NULL */
-static int hf_x509sat_intMonth = -1;              /* SET_OF_INTEGER */
+static int hf_x509sat_intMonth = -1;              /* T_intMonth */
 static int hf_x509sat_intMonth_item = -1;         /* INTEGER */
 static int hf_x509sat_bitMonth = -1;              /* T_bitMonth */
-static int hf_x509sat_years = -1;                 /* SET_OF_INTEGER */
+static int hf_x509sat_years = -1;                 /* T_years */
 static int hf_x509sat_years_item = -1;            /* INTEGER */
 static int hf_x509sat_first_dayof = -1;           /* NamedDay */
 static int hf_x509sat_second_dayof = -1;          /* NamedDay */
@@ -196,12 +196,12 @@ static gint ett_x509sat_TelexNumber = -1;
 static gint ett_x509sat_FacsimileTelephoneNumber = -1;
 static gint ett_x509sat_PreferredDeliveryMethod = -1;
 static gint ett_x509sat_PresentationAddress = -1;
-static gint ett_x509sat_SET_OF_OCTET_STRING = -1;
+static gint ett_x509sat_T_nAddresses = -1;
 static gint ett_x509sat_ProtocolInformation = -1;
-static gint ett_x509sat_SET_OF_OBJECT_IDENTIFIER = -1;
+static gint ett_x509sat_T_profiles = -1;
 static gint ett_x509sat_NameAndOptionalUID = -1;
 static gint ett_x509sat_MultipleMatchingLocalities = -1;
-static gint ett_x509sat_SEQUNCE_OF_AttributeValueAssertion = -1;
+static gint ett_x509sat_SEQUENCE_OF_AttributeValueAssertion = -1;
 static gint ett_x509sat_SubstringAssertion = -1;
 static gint ett_x509sat_SubstringAssertion_item = -1;
 static gint ett_x509sat_CaseIgnoreListMatch = -1;
@@ -215,12 +215,15 @@ static gint ett_x509sat_SET_OF_Period = -1;
 static gint ett_x509sat_Period = -1;
 static gint ett_x509sat_SET_OF_DayTimeBand = -1;
 static gint ett_x509sat_T_days = -1;
-static gint ett_x509sat_SET_OF_INTEGER = -1;
+static gint ett_x509sat_T_intDay = -1;
 static gint ett_x509sat_T_bitDay = -1;
 static gint ett_x509sat_T_weeks = -1;
+static gint ett_x509sat_T_intWeek = -1;
 static gint ett_x509sat_T_bitWeek = -1;
 static gint ett_x509sat_T_months = -1;
+static gint ett_x509sat_T_intMonth = -1;
 static gint ett_x509sat_T_bitMonth = -1;
+static gint ett_x509sat_T_years = -1;
 static gint ett_x509sat_XDayOf = -1;
 static gint ett_x509sat_NamedDay = -1;
 static gint ett_x509sat_T_bitNamedDays = -1;
@@ -337,7 +340,7 @@ dissect_x509sat_CountryName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
 }
 
 
-static const value_string CriteriaItem_vals[] = {
+static const value_string x509sat_CriteriaItem_vals[] = {
   {   0, "equality" },
   {   1, "substrings" },
   {   2, "greaterOrEqual" },
@@ -385,7 +388,7 @@ static int dissect_or(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int o
 }
 
 
-const value_string Criteria_vals[] = {
+const value_string x509sat_Criteria_vals[] = {
   {   0, "type" },
   {   1, "and" },
   {   2, "or" },
@@ -431,7 +434,7 @@ static int dissect_localeID1(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb
 }
 
 
-static const value_string T_subset_vals[] = {
+static const value_string x509sat_T_subset_vals[] = {
   {   0, "baseObject" },
   {   1, "oneLevel" },
   {   2, "wholeSubtree" },
@@ -567,7 +570,7 @@ dissect_x509sat_DestinationIndicator(gboolean implicit_tag _U_, tvbuff_t *tvb, i
 }
 
 
-static const value_string PreferredDeliveryMethod_item_vals[] = {
+static const value_string x509sat_PreferredDeliveryMethod_item_vals[] = {
   {   0, "any-delivery-method" },
   {   1, "mhs-delivery" },
   {   2, "physical-delivery" },
@@ -637,19 +640,19 @@ static int dissect_finall_substring(packet_info *pinfo, proto_tree *tree, tvbuff
   return dissect_x509sat_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_finall_substring);
 }
 
-static const ber_sequence_t SET_OF_OCTET_STRING_set_of[1] = {
+static const ber_sequence_t T_nAddresses_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_nAddresses_item },
 };
 
 static int
-dissect_x509sat_SET_OF_OCTET_STRING(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509sat_T_nAddresses(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
-                              SET_OF_OCTET_STRING_set_of, hf_index, ett_x509sat_SET_OF_OCTET_STRING);
+                              T_nAddresses_set_of, hf_index, ett_x509sat_T_nAddresses);
 
   return offset;
 }
 static int dissect_nAddresses(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509sat_SET_OF_OCTET_STRING(FALSE, tvb, offset, pinfo, tree, hf_x509sat_nAddresses);
+  return dissect_x509sat_T_nAddresses(FALSE, tvb, offset, pinfo, tree, hf_x509sat_nAddresses);
 }
 
 static const ber_sequence_t PresentationAddress_sequence[] = {
@@ -668,19 +671,19 @@ dissect_x509sat_PresentationAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, in
   return offset;
 }
 
-static const ber_sequence_t SET_OF_OBJECT_IDENTIFIER_set_of[1] = {
+static const ber_sequence_t T_profiles_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_OID, BER_FLAGS_NOOWNTAG, dissect_profiles_item },
 };
 
 static int
-dissect_x509sat_SET_OF_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509sat_T_profiles(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
-                              SET_OF_OBJECT_IDENTIFIER_set_of, hf_index, ett_x509sat_SET_OF_OBJECT_IDENTIFIER);
+                              T_profiles_set_of, hf_index, ett_x509sat_T_profiles);
 
   return offset;
 }
 static int dissect_profiles(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509sat_SET_OF_OBJECT_IDENTIFIER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_profiles);
+  return dissect_x509sat_T_profiles(FALSE, tvb, offset, pinfo, tree, hf_x509sat_profiles);
 }
 
 static const ber_sequence_t ProtocolInformation_sequence[] = {
@@ -711,19 +714,19 @@ dissect_x509sat_NameAndOptionalUID(gboolean implicit_tag _U_, tvbuff_t *tvb, int
   return offset;
 }
 
-static const ber_sequence_t SEQUNCE_OF_AttributeValueAssertion_sequence_of[1] = {
+static const ber_sequence_t SEQUENCE_OF_AttributeValueAssertion_sequence_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_attributeList_item },
 };
 
 static int
-dissect_x509sat_SEQUNCE_OF_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509sat_SEQUENCE_OF_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, pinfo, tree, tvb, offset,
-                                   SEQUNCE_OF_AttributeValueAssertion_sequence_of, hf_index, ett_x509sat_SEQUNCE_OF_AttributeValueAssertion);
+                                   SEQUENCE_OF_AttributeValueAssertion_sequence_of, hf_index, ett_x509sat_SEQUENCE_OF_AttributeValueAssertion);
 
   return offset;
 }
 static int dissect_attributeList(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509sat_SEQUNCE_OF_AttributeValueAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509sat_attributeList);
+  return dissect_x509sat_SEQUENCE_OF_AttributeValueAssertion(FALSE, tvb, offset, pinfo, tree, hf_x509sat_attributeList);
 }
 
 static const ber_sequence_t MultipleMatchingLocalities_sequence[] = {
@@ -741,7 +744,7 @@ dissect_x509sat_MultipleMatchingLocalities(gboolean implicit_tag _U_, tvbuff_t *
 }
 
 
-static const value_string SubstringAssertion_item_vals[] = {
+static const value_string x509sat_SubstringAssertion_item_vals[] = {
   {   0, "initial" },
   {   1, "any" },
   {   2, "final" },
@@ -793,7 +796,7 @@ dissect_x509sat_CaseIgnoreListMatch(gboolean implicit_tag _U_, tvbuff_t *tvb, in
 }
 
 
-static const value_string OctetSubstringAssertion_item_vals[] = {
+static const value_string x509sat_OctetSubstringAssertion_item_vals[] = {
   {   0, "initial" },
   {   1, "any" },
   {   2, "final" },
@@ -843,7 +846,7 @@ dissect_x509sat_ZonalSelect(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
 }
 
 
-const value_string ZonalResult_vals[] = {
+const value_string x509sat_ZonalResult_vals[] = {
   {   0, "cannot-select-mapping" },
   {   2, "zero-mappings" },
   {   3, "multiple-mappings" },
@@ -985,28 +988,19 @@ static int dissect_timesOfDay(packet_info *pinfo, proto_tree *tree, tvbuff_t *tv
   return dissect_x509sat_SET_OF_DayTimeBand(FALSE, tvb, offset, pinfo, tree, hf_x509sat_timesOfDay);
 }
 
-static const ber_sequence_t SET_OF_INTEGER_set_of[1] = {
+static const ber_sequence_t T_intDay_set_of[1] = {
   { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intDay_item },
 };
 
 static int
-dissect_x509sat_SET_OF_INTEGER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+dissect_x509sat_T_intDay(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
   offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
-                              SET_OF_INTEGER_set_of, hf_index, ett_x509sat_SET_OF_INTEGER);
+                              T_intDay_set_of, hf_index, ett_x509sat_T_intDay);
 
   return offset;
 }
 static int dissect_intDay(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509sat_SET_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intDay);
-}
-static int dissect_intWeek(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509sat_SET_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intWeek);
-}
-static int dissect_intMonth(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509sat_SET_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intMonth);
-}
-static int dissect_years(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
-  return dissect_x509sat_SET_OF_INTEGER(FALSE, tvb, offset, pinfo, tree, hf_x509sat_years);
+  return dissect_x509sat_T_intDay(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intDay);
 }
 
 static const asn_namedbit T_bitDay_bits[] = {
@@ -1033,7 +1027,7 @@ static int dissect_bitDay(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
 }
 
 
-static const value_string T_intNamedDays_vals[] = {
+static const value_string x509sat_T_intNamedDays_vals[] = {
   {   1, "sunday" },
   {   2, "monday" },
   {   3, "tuesday" },
@@ -1079,7 +1073,7 @@ static int dissect_bitNamedDays(packet_info *pinfo, proto_tree *tree, tvbuff_t *
 }
 
 
-const value_string NamedDay_vals[] = {
+const value_string x509sat_NamedDay_vals[] = {
   {   0, "intNamedDays" },
   {   1, "bitNamedDays" },
   { 0, NULL }
@@ -1115,7 +1109,7 @@ static int dissect_fifth_dayof(packet_info *pinfo, proto_tree *tree, tvbuff_t *t
 }
 
 
-const value_string XDayOf_vals[] = {
+const value_string x509sat_XDayOf_vals[] = {
   {   1, "first" },
   {   2, "second" },
   {   3, "third" },
@@ -1145,7 +1139,7 @@ static int dissect_dayOf(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
 }
 
 
-static const value_string T_days_vals[] = {
+static const value_string x509sat_T_days_vals[] = {
   {   0, "intDay" },
   {   1, "bitDay" },
   {   2, "dayOf" },
@@ -1190,6 +1184,21 @@ static int dissect_now(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
   return dissect_x509sat_NULL(FALSE, tvb, offset, pinfo, tree, hf_x509sat_now);
 }
 
+static const ber_sequence_t T_intWeek_set_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intWeek_item },
+};
+
+static int
+dissect_x509sat_T_intWeek(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
+                              T_intWeek_set_of, hf_index, ett_x509sat_T_intWeek);
+
+  return offset;
+}
+static int dissect_intWeek(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_x509sat_T_intWeek(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intWeek);
+}
+
 static const asn_namedbit T_bitWeek_bits[] = {
   {  0, &hf_x509sat_T_bitWeek_week1, -1, -1, NULL, NULL },
   {  1, &hf_x509sat_T_bitWeek_week2, -1, -1, NULL, NULL },
@@ -1212,7 +1221,7 @@ static int dissect_bitWeek(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 }
 
 
-static const value_string T_weeks_vals[] = {
+static const value_string x509sat_T_weeks_vals[] = {
   {   0, "allWeeks" },
   {   1, "intWeek" },
   {   2, "bitWeek" },
@@ -1237,6 +1246,21 @@ static int dissect_weeks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in
   return dissect_x509sat_T_weeks(FALSE, tvb, offset, pinfo, tree, hf_x509sat_weeks);
 }
 
+static const ber_sequence_t T_intMonth_set_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_intMonth_item },
+};
+
+static int
+dissect_x509sat_T_intMonth(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
+                              T_intMonth_set_of, hf_index, ett_x509sat_T_intMonth);
+
+  return offset;
+}
+static int dissect_intMonth(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_x509sat_T_intMonth(FALSE, tvb, offset, pinfo, tree, hf_x509sat_intMonth);
+}
+
 static const asn_namedbit T_bitMonth_bits[] = {
   {  0, &hf_x509sat_T_bitMonth_january, -1, -1, NULL, NULL },
   {  1, &hf_x509sat_T_bitMonth_february, -1, -1, NULL, NULL },
@@ -1266,7 +1290,7 @@ static int dissect_bitMonth(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 }
 
 
-static const value_string T_months_vals[] = {
+static const value_string x509sat_T_months_vals[] = {
   {   0, "allMonths" },
   {   1, "intMonth" },
   {   2, "bitMonth" },
@@ -1291,6 +1315,21 @@ static int dissect_months(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, i
   return dissect_x509sat_T_months(FALSE, tvb, offset, pinfo, tree, hf_x509sat_months);
 }
 
+static const ber_sequence_t T_years_set_of[1] = {
+  { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_years_item },
+};
+
+static int
+dissect_x509sat_T_years(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
+  offset = dissect_ber_set_of(implicit_tag, pinfo, tree, tvb, offset,
+                              T_years_set_of, hf_index, ett_x509sat_T_years);
+
+  return offset;
+}
+static int dissect_years(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset) {
+  return dissect_x509sat_T_years(FALSE, tvb, offset, pinfo, tree, hf_x509sat_years);
+}
+
 static const ber_sequence_t Period_sequence[] = {
   { BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL, dissect_timesOfDay },
   { BER_CLASS_CON, 1, BER_FLAGS_OPTIONAL, dissect_days },
@@ -1327,7 +1366,7 @@ static int dissect_periodic(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 }
 
 
-static const value_string T_time_vals[] = {
+static const value_string x509sat_T_time_vals[] = {
   {   0, "absolute" },
   {   1, "periodic" },
   { 0, NULL }
@@ -1353,7 +1392,7 @@ static int dissect_time(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
 
 static int
 dissect_x509sat_BOOLEAN(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) {
-  offset = dissect_ber_boolean(pinfo, tree, tvb, offset, hf_index);
+  offset = dissect_ber_boolean(implicit_tag, pinfo, tree, tvb, offset, hf_index);
 
   return offset;
 }
@@ -1410,7 +1449,7 @@ static int dissect_between(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
 }
 
 
-const value_string TimeAssertion_vals[] = {
+const value_string x509sat_TimeAssertion_vals[] = {
   {   0, "now" },
   {   1, "at" },
   {   2, "between" },
@@ -1433,7 +1472,7 @@ dissect_x509sat_TimeAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offs
 }
 
 
-const value_string LocaleContextSyntax_vals[] = {
+const value_string x509sat_LocaleContextSyntax_vals[] = {
   {   0, "localeID1" },
   {   1, "localeID2" },
   { 0, NULL }
@@ -1499,7 +1538,7 @@ void proto_register_x509sat(void) {
         "TelexNumber", HFILL }},
     { &hf_x509sat_type,
       { "type", "x509sat.type",
-        FT_UINT32, BASE_DEC, VALS(CriteriaItem_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_CriteriaItem_vals), 0,
         "Criteria/type", HFILL }},
     { &hf_x509sat_and,
       { "and", "x509sat.and",
@@ -1507,7 +1546,7 @@ void proto_register_x509sat(void) {
         "Criteria/and", HFILL }},
     { &hf_x509sat_and_item,
       { "Item", "x509sat.and_item",
-        FT_UINT32, BASE_DEC, VALS(Criteria_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0,
         "Criteria/and/_item", HFILL }},
     { &hf_x509sat_or,
       { "or", "x509sat.or",
@@ -1515,11 +1554,11 @@ void proto_register_x509sat(void) {
         "Criteria/or", HFILL }},
     { &hf_x509sat_or_item,
       { "Item", "x509sat.or_item",
-        FT_UINT32, BASE_DEC, VALS(Criteria_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0,
         "Criteria/or/_item", HFILL }},
     { &hf_x509sat_not,
       { "not", "x509sat.not",
-        FT_UINT32, BASE_DEC, VALS(Criteria_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0,
         "Criteria/not", HFILL }},
     { &hf_x509sat_equality,
       { "equality", "x509sat.equality",
@@ -1547,11 +1586,11 @@ void proto_register_x509sat(void) {
         "EnhancedGuide/objectClass", HFILL }},
     { &hf_x509sat_criteria,
       { "criteria", "x509sat.criteria",
-        FT_UINT32, BASE_DEC, VALS(Criteria_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_Criteria_vals), 0,
         "EnhancedGuide/criteria", HFILL }},
     { &hf_x509sat_subset,
       { "subset", "x509sat.subset",
-        FT_INT32, BASE_DEC, VALS(T_subset_vals), 0,
+        FT_INT32, BASE_DEC, VALS(x509sat_T_subset_vals), 0,
         "EnhancedGuide/subset", HFILL }},
     { &hf_x509sat_PostalAddress_item,
       { "Item", "x509sat.PostalAddress_item",
@@ -1575,7 +1614,7 @@ void proto_register_x509sat(void) {
         "FacsimileTelephoneNumber/telephoneNumber", HFILL }},
     { &hf_x509sat_PreferredDeliveryMethod_item,
       { "Item", "x509sat.PreferredDeliveryMethod_item",
-        FT_INT32, BASE_DEC, VALS(PreferredDeliveryMethod_item_vals), 0,
+        FT_INT32, BASE_DEC, VALS(x509sat_PreferredDeliveryMethod_item_vals), 0,
         "PreferredDeliveryMethod/_item", HFILL }},
     { &hf_x509sat_pSelector,
       { "pSelector", "x509sat.pSelector",
@@ -1631,7 +1670,7 @@ void proto_register_x509sat(void) {
         "MultipleMatchingLocalities/attributeList/_item", HFILL }},
     { &hf_x509sat_SubstringAssertion_item,
       { "Item", "x509sat.SubstringAssertion_item",
-        FT_UINT32, BASE_DEC, VALS(SubstringAssertion_item_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_SubstringAssertion_item_vals), 0,
         "SubstringAssertion/_item", HFILL }},
     { &hf_x509sat_initial,
       { "initial", "x509sat.initial",
@@ -1655,7 +1694,7 @@ void proto_register_x509sat(void) {
         "CaseIgnoreListMatch/_item", HFILL }},
     { &hf_x509sat_OctetSubstringAssertion_item,
       { "Item", "x509sat.OctetSubstringAssertion_item",
-        FT_UINT32, BASE_DEC, VALS(OctetSubstringAssertion_item_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_OctetSubstringAssertion_item_vals), 0,
         "OctetSubstringAssertion/_item", HFILL }},
     { &hf_x509sat_initial_substring,
       { "initial", "x509sat.initial",
@@ -1675,7 +1714,7 @@ void proto_register_x509sat(void) {
         "ZonalSelect/_item", HFILL }},
     { &hf_x509sat_time,
       { "time", "x509sat.time",
-        FT_UINT32, BASE_DEC, VALS(T_time_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_T_time_vals), 0,
         "TimeSpecification/time", HFILL }},
     { &hf_x509sat_absolute,
       { "absolute", "x509sat.absolute",
@@ -1715,7 +1754,7 @@ void proto_register_x509sat(void) {
         "Period/timesOfDay/_item", HFILL }},
     { &hf_x509sat_days,
       { "days", "x509sat.days",
-        FT_UINT32, BASE_DEC, VALS(T_days_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_T_days_vals), 0,
         "Period/days", HFILL }},
     { &hf_x509sat_intDay,
       { "intDay", "x509sat.intDay",
@@ -1731,11 +1770,11 @@ void proto_register_x509sat(void) {
         "Period/days/bitDay", HFILL }},
     { &hf_x509sat_dayOf,
       { "dayOf", "x509sat.dayOf",
-        FT_UINT32, BASE_DEC, VALS(XDayOf_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_XDayOf_vals), 0,
         "Period/days/dayOf", HFILL }},
     { &hf_x509sat_weeks,
       { "weeks", "x509sat.weeks",
-        FT_UINT32, BASE_DEC, VALS(T_weeks_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_T_weeks_vals), 0,
         "Period/weeks", HFILL }},
     { &hf_x509sat_allWeeks,
       { "allWeeks", "x509sat.allWeeks",
@@ -1755,7 +1794,7 @@ void proto_register_x509sat(void) {
         "Period/weeks/bitWeek", HFILL }},
     { &hf_x509sat_months,
       { "months", "x509sat.months",
-        FT_UINT32, BASE_DEC, VALS(T_months_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_T_months_vals), 0,
         "Period/months", HFILL }},
     { &hf_x509sat_allMonths,
       { "allMonths", "x509sat.allMonths",
@@ -1783,27 +1822,27 @@ void proto_register_x509sat(void) {
         "Period/years/_item", HFILL }},
     { &hf_x509sat_first_dayof,
       { "first", "x509sat.first",
-        FT_UINT32, BASE_DEC, VALS(NamedDay_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_NamedDay_vals), 0,
         "XDayOf/first", HFILL }},
     { &hf_x509sat_second_dayof,
       { "second", "x509sat.second",
-        FT_UINT32, BASE_DEC, VALS(NamedDay_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_NamedDay_vals), 0,
         "XDayOf/second", HFILL }},
     { &hf_x509sat_third_dayof,
       { "third", "x509sat.third",
-        FT_UINT32, BASE_DEC, VALS(NamedDay_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_NamedDay_vals), 0,
         "XDayOf/third", HFILL }},
     { &hf_x509sat_fourth_dayof,
       { "fourth", "x509sat.fourth",
-        FT_UINT32, BASE_DEC, VALS(NamedDay_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_NamedDay_vals), 0,
         "XDayOf/fourth", HFILL }},
     { &hf_x509sat_fifth_dayof,
       { "fifth", "x509sat.fifth",
-        FT_UINT32, BASE_DEC, VALS(NamedDay_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_NamedDay_vals), 0,
         "XDayOf/fifth", HFILL }},
     { &hf_x509sat_intNamedDays,
       { "intNamedDays", "x509sat.intNamedDays",
-        FT_UINT32, BASE_DEC, VALS(T_intNamedDays_vals), 0,
+        FT_UINT32, BASE_DEC, VALS(x509sat_T_intNamedDays_vals), 0,
         "NamedDay/intNamedDays", HFILL }},
     { &hf_x509sat_bitNamedDays,
       { "bitNamedDays", "x509sat.bitNamedDays",
@@ -1996,12 +2035,12 @@ void proto_register_x509sat(void) {
     &ett_x509sat_FacsimileTelephoneNumber,
     &ett_x509sat_PreferredDeliveryMethod,
     &ett_x509sat_PresentationAddress,
-    &ett_x509sat_SET_OF_OCTET_STRING,
+    &ett_x509sat_T_nAddresses,
     &ett_x509sat_ProtocolInformation,
-    &ett_x509sat_SET_OF_OBJECT_IDENTIFIER,
+    &ett_x509sat_T_profiles,
     &ett_x509sat_NameAndOptionalUID,
     &ett_x509sat_MultipleMatchingLocalities,
-    &ett_x509sat_SEQUNCE_OF_AttributeValueAssertion,
+    &ett_x509sat_SEQUENCE_OF_AttributeValueAssertion,
     &ett_x509sat_SubstringAssertion,
     &ett_x509sat_SubstringAssertion_item,
     &ett_x509sat_CaseIgnoreListMatch,
@@ -2015,12 +2054,15 @@ void proto_register_x509sat(void) {
     &ett_x509sat_Period,
     &ett_x509sat_SET_OF_DayTimeBand,
     &ett_x509sat_T_days,
-    &ett_x509sat_SET_OF_INTEGER,
+    &ett_x509sat_T_intDay,
     &ett_x509sat_T_bitDay,
     &ett_x509sat_T_weeks,
+    &ett_x509sat_T_intWeek,
     &ett_x509sat_T_bitWeek,
     &ett_x509sat_T_months,
+    &ett_x509sat_T_intMonth,
     &ett_x509sat_T_bitMonth,
+    &ett_x509sat_T_years,
     &ett_x509sat_XDayOf,
     &ett_x509sat_NamedDay,
     &ett_x509sat_T_bitNamedDays,
index 636f78cf371ca4ff9c88ac052ea55d1ad6233fef..d47365e2b2189ca9c107de4277fc644f5dc1631c 100644 (file)
 
 /*--- Included file: packet-x509sat-exp.h ---*/
 
-extern const value_string Criteria_vals[];
-extern const value_string ZonalResult_vals[];
-extern const value_string XDayOf_vals[];
-extern const value_string NamedDay_vals[];
-extern const value_string TimeAssertion_vals[];
-extern const value_string LocaleContextSyntax_vals[];
+extern const value_string x509sat_Criteria_vals[];
+extern const value_string x509sat_ZonalResult_vals[];
+extern const value_string x509sat_XDayOf_vals[];
+extern const value_string x509sat_NamedDay_vals[];
+extern const value_string x509sat_TimeAssertion_vals[];
+extern const value_string x509sat_LocaleContextSyntax_vals[];
 int dissect_x509sat_DirectoryString(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_x509sat_UniqueIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
 int dissect_x509sat_CountryName(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index);
index 995bfdab2766c3adb4ade59bb02fca93a85012c9..96d6440367ad7de547015a7940a0d95aba11540b 100644 (file)
@@ -2654,7 +2654,7 @@ class BooleanType (Type):
     out = ectx.eth_type_fn_hdr(tname)
     if (ectx.Ber()):
       body = ectx.eth_fn_call('dissect_ber_boolean', ret='offset',
-                              par=(('pinfo', 'tree', 'tvb', 'offset', 'hf_index'),))
+                              par=(('implicit_tag', 'pinfo', 'tree', 'tvb', 'offset', 'hf_index'),))
     elif (ectx.NPer()):
       body = ectx.eth_fn_call('dissect_pern_boolean', ret='offset',
                               par=(('tvb', 'offset', 'pinfo', 'tree'),