Regenerate dissectors with the current asn2eth.

svn path=/trunk/; revision=15664

8 files changed, 23 insertions, 23 deletions

diff --git a/asn1/cms/cms-exp.cnf b/asn1/cms/cms-exp.cnf
index 71f8a9199d..4cb6434014 100644
--- a/asn1/cms/cms-exp.cnf
+++ b/asn1/cms/cms-exp.cnf
@@ -6,7 +6,7 @@ DigestAlgorithmIdentifiers BER_CLASS_UNI BER_UNI_TAG_SET
 SignerInfos              BER_CLASS_UNI BER_UNI_TAG_SET
 EncapsulatedContentInfo  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 SignerInfo               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-SignerIdentifier         -1/*choice*/ -1/*choice*/
+SignerIdentifier         BER_CLASS_ANY/*choice*/ -1/*choice*/
 SignedAttributes         BER_CLASS_UNI BER_UNI_TAG_SET
 UnsignedAttributes       BER_CLASS_UNI BER_UNI_TAG_SET
 SignatureValue           BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING
diff --git a/asn1/mms/mms-exp.cnf b/asn1/mms/mms-exp.cnf
index 7b5fbd5918..6d1be09b4e 100644
--- a/asn1/mms/mms-exp.cnf
+++ b/asn1/mms/mms-exp.cnf
@@ -1,5 +1,5 @@
 #.IMPORT_TAG
-MMSpdu                   BER_CLASS_CON -1/*choice*/
+MMSpdu                   BER_CLASS_ANY/*choice*/ -1/*choice*/
 #.END
 
 #.TYPE_ATTR
diff --git a/asn1/pkixcmp/cmp-exp.cnf b/asn1/pkixcmp/cmp-exp.cnf
index 36c6472139..c5ee310b08 100644
--- a/asn1/pkixcmp/cmp-exp.cnf
+++ b/asn1/pkixcmp/cmp-exp.cnf
@@ -2,7 +2,7 @@
 PKIMessage               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 PKIHeader                BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 PKIFreeText              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-PKIBody                  BER_CLASS_CON -1/*choice*/
+PKIBody                  BER_CLASS_ANY/*choice*/ -1/*choice*/
 PKIProtection            BER_CLASS_UNI BER_UNI_TAG_BITSTRING
 ProtectedPart            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 PasswordBasedMac         BER_CLASS_UNI BER_UNI_TAG_OID
@@ -21,7 +21,7 @@ POPODecKeyRespContent    BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 CertRepMessage           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 CertResponse             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 CertifiedKeyPair         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-CertOrEncCert            BER_CLASS_CON -1/*choice*/
+CertOrEncCert            BER_CLASS_ANY/*choice*/ -1/*choice*/
 KeyRecRepContent         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 RevReqContent            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 RevDetails               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/pkixcrmf/crmf-exp.cnf b/asn1/pkixcrmf/crmf-exp.cnf
index 9aa1a89fad..9cbf380221 100644
--- a/asn1/pkixcrmf/crmf-exp.cnf
+++ b/asn1/pkixcrmf/crmf-exp.cnf
@@ -6,19 +6,19 @@ CertTemplate             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 OptionalValidity         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 Controls                 BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 AttributeTypeAndValue    BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ProofOfPossession        BER_CLASS_CON -1/*choice*/
+ProofOfPossession        BER_CLASS_ANY/*choice*/ -1/*choice*/
 POPOSigningKey           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 POPOSigningKeyInput      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 PKMACValue               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 PBMParameter             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-POPOPrivKey              BER_CLASS_CON -1/*choice*/
+POPOPrivKey              BER_CLASS_ANY/*choice*/ -1/*choice*/
 SubsequentMessage        BER_CLASS_UNI BER_UNI_TAG_INTEGER
 RegToken                 BER_CLASS_UNI BER_UNI_TAG_UTF8String
 Authenticator            BER_CLASS_UNI BER_UNI_TAG_UTF8String
 PKIPublicationInfo       BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 SinglePubInfo            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-PKIArchiveOptions        BER_CLASS_CON -1/*choice*/
-EncryptedKey             -1/*choice*/ -1/*choice*/
+PKIArchiveOptions        BER_CLASS_ANY/*choice*/ -1/*choice*/
+EncryptedKey             BER_CLASS_ANY/*choice*/ -1/*choice*/
 EncryptedValue           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 KeyGenParameters         BER_CLASS_UNI BER_UNI_TAG_OCTETSTRING
 OldCertId                BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/x509af/x509af-exp.cnf b/asn1/x509af/x509af-exp.cnf
index be84bfb334..111664f963 100644
--- a/asn1/x509af/x509af-exp.cnf
+++ b/asn1/x509af/x509af-exp.cnf
@@ -5,7 +5,7 @@ CertificateSerialNumber  BER_CLASS_UNI BER_UNI_TAG_INTEGER
 AlgorithmIdentifier      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 Validity                 BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 SubjectPublicKeyInfo     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Time                     BER_CLASS_UNI -1/*choice*/
+Time                     BER_CLASS_ANY/*choice*/ -1/*choice*/
 Extensions               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 Extension                BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 Certificates             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/x509ce/x509ce-exp.cnf b/asn1/x509ce/x509ce-exp.cnf
index 342032bcdf..e9748da6de 100644
--- a/asn1/x509ce/x509ce-exp.cnf
+++ b/asn1/x509ce/x509ce-exp.cnf
@@ -11,7 +11,7 @@ PolicyInformation        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 PolicyQualifierInfo      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 PolicyMappingsSyntax     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 GeneralNames             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-GeneralName              BER_CLASS_CON -1/*choice*/
+GeneralName              BER_CLASS_ANY/*choice*/ -1/*choice*/
 EDIPartyName             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 AttributesSyntax         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 BasicConstraintsSyntax   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
@@ -30,7 +30,7 @@ OnlyCertificateTypes     BER_CLASS_UNI BER_UNI_TAG_BITSTRING
 NumberRange              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 BaseRevocationInfo       BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 StatusReferrals          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-StatusReferral           BER_CLASS_CON -1/*choice*/
+StatusReferral           BER_CLASS_ANY/*choice*/ -1/*choice*/
 CRLReferral              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 DeltaRefInfo             BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 CRLStreamIdentifier      BER_CLASS_UNI BER_UNI_TAG_INTEGER
@@ -38,13 +38,13 @@ OrderedListSyntax        BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
 DeltaInformation         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 CRLDistPointsSyntax      BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 DistributionPoint        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-DistributionPointName    BER_CLASS_CON -1/*choice*/
+DistributionPointName    BER_CLASS_ANY/*choice*/ -1/*choice*/
 ReasonFlags              BER_CLASS_UNI BER_UNI_TAG_BITSTRING
 IssuingDistPointSyntax   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 BaseCRLNumber            BER_CLASS_UNI BER_UNI_TAG_INTEGER
 CertificateExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 CertificateAssertion     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AltNameType              BER_CLASS_UNI -1/*choice*/
+AltNameType              BER_CLASS_ANY/*choice*/ -1/*choice*/
 CertPolicySet            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 CertificatePairExactAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 CertificatePairAssertion BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/x509if/x509if-exp.cnf b/asn1/x509if/x509if-exp.cnf
index 99a26890cc..ff9802e1d5 100644
--- a/asn1/x509if/x509if-exp.cnf
+++ b/asn1/x509if/x509if-exp.cnf
@@ -5,7 +5,7 @@ Context                  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 AttributeValueAssertion  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 ContextAssertion         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 AttributeTypeAssertion   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-Name                     BER_CLASS_UNI -1/*choice*/
+Name                     BER_CLASS_ANY/*choice*/ -1/*choice*/
 RDNSequence              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 DistinguishedName        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 RelativeDistinguishedName BER_CLASS_UNI BER_UNI_TAG_SET
@@ -14,7 +14,7 @@ SubtreeSpecification     BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 LocalName                BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 ChopSpecification        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 BaseDistance             BER_CLASS_UNI BER_UNI_TAG_INTEGER
-Refinement               BER_CLASS_CON -1/*choice*/
+Refinement               BER_CLASS_ANY/*choice*/ -1/*choice*/
 AttributeUsage           BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
 DITStructureRule         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 RuleIdentifier           BER_CLASS_UNI BER_UNI_TAG_INTEGER
@@ -27,11 +27,11 @@ AllowedSubset            BER_CLASS_UNI BER_UNI_TAG_BITSTRING
 ImposedSubset            BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
 RequestAttribute         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 ContextProfile           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-ContextCombination       BER_CLASS_CON -1/*choice*/
+ContextCombination       BER_CLASS_ANY/*choice*/ -1/*choice*/
 MatchingUse              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-AttributeCombination     BER_CLASS_CON -1/*choice*/
+AttributeCombination     BER_CLASS_ANY/*choice*/ -1/*choice*/
 ResultAttribute          BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-OutputValues             BER_CLASS_UNI -1/*choice*/
+OutputValues             BER_CLASS_ANY/*choice*/ -1/*choice*/
 ControlOptions           BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 EntryLimit               BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 RelaxationPolicy         BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
diff --git a/asn1/x509sat/x509sat-exp.cnf b/asn1/x509sat/x509sat-exp.cnf
index 0b9e19f4a5..6f411f0608 100644
--- a/asn1/x509sat/x509sat-exp.cnf
+++ b/asn1/x509sat/x509sat-exp.cnf
@@ -2,7 +2,7 @@
 DirectoryString          BER_CLASS_UNI BER_UNI_TAG_PrintableString
 UniqueIdentifier         BER_CLASS_UNI BER_UNI_TAG_BITSTRING
 CountryName              BER_CLASS_UNI BER_UNI_TAG_PrintableString
-Criteria                 BER_CLASS_CON -1/*choice*/
+Criteria                 BER_CLASS_ANY/*choice*/ -1/*choice*/
 EnhancedGuide            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 PostalAddress            BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 FacsimileTelephoneNumber BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
@@ -22,13 +22,13 @@ ZonalResult              BER_CLASS_UNI BER_UNI_TAG_ENUMERATED
 LanguageContextSyntax    BER_CLASS_UNI BER_UNI_TAG_PrintableString
 TimeSpecification        BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 Period                   BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
-XDayOf                   BER_CLASS_CON -1/*choice*/
-NamedDay                 BER_CLASS_UNI -1/*choice*/
+XDayOf                   BER_CLASS_ANY/*choice*/ -1/*choice*/
+NamedDay                 BER_CLASS_ANY/*choice*/ -1/*choice*/
 DayTimeBand              BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 DayTime                  BER_CLASS_UNI BER_UNI_TAG_SEQUENCE
 TimeZone                 BER_CLASS_UNI BER_UNI_TAG_INTEGER
-TimeAssertion            BER_CLASS_UNI -1/*choice*/
-LocaleContextSyntax      BER_CLASS_UNI -1/*choice*/
+TimeAssertion            BER_CLASS_ANY/*choice*/ -1/*choice*/
+LocaleContextSyntax      BER_CLASS_ANY/*choice*/ -1/*choice*/
 #.END
 
 #.TYPE_ATTR