diff options
author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-07-28 07:55:57 +0000 |
---|---|---|
committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2004-07-28 07:55:57 +0000 |
commit | 0fd5931b07feccaf08569d1e4144f92afb6466fe (patch) | |
tree | 3d0b2384382350b456d12c72247ee2e37cbc688d /asn1/x509ce | |
parent | ec33d95bc83e20821623dc65f9845dc0be7bb9e5 (diff) | |
download | wireshark-0fd5931b07feccaf08569d1e4144f92afb6466fe.tar.gz |
x509ce use implicit tags.
the compiler does not yet support this.
change the definition file to make the implicit keyword explicit
svn path=/trunk/; revision=11550
Diffstat (limited to 'asn1/x509ce')
-rw-r--r-- | asn1/x509ce/CertificateExtensions.asn | 154 |
1 files changed, 77 insertions, 77 deletions
diff --git a/asn1/x509ce/CertificateExtensions.asn b/asn1/x509ce/CertificateExtensions.asn index fecdf931fd..cb5558245f 100644 --- a/asn1/x509ce/CertificateExtensions.asn +++ b/asn1/x509ce/CertificateExtensions.asn @@ -34,9 +34,9 @@ IMPORTS -- } AuthorityKeyIdentifier ::= SEQUENCE { - keyIdentifier [0] KeyIdentifier OPTIONAL, - authorityCertIssuer [1] GeneralNames OPTIONAL, - authorityCertSerialNumber [2] CertificateSerialNumber OPTIONAL + keyIdentifier [0] IMPLICIT KeyIdentifier OPTIONAL, + authorityCertIssuer [1] IMPLICIT GeneralNames OPTIONAL, + authorityCertSerialNumber [2] IMPLICIT CertificateSerialNumber OPTIONAL } -- (WITH COMPONENTS { -- ..., @@ -82,8 +82,8 @@ KeyPurposeId ::= OBJECT IDENTIFIER -- } PrivateKeyUsagePeriod ::= SEQUENCE { - notBefore [0] GeneralizedTime OPTIONAL, - notAfter [1] GeneralizedTime OPTIONAL + notBefore [0] IMPLICIT GeneralizedTime OPTIONAL, + notAfter [1] IMPLICIT GeneralizedTime OPTIONAL } -- (WITH COMPONENTS { -- ..., @@ -145,22 +145,22 @@ PolicyMappingsSyntax ::= GeneralNames ::= SEQUENCE SIZE (1..MAX) OF GeneralName GeneralName ::= CHOICE { --- otherName [0] INSTANCE OF OTHER-NAME, - rfc822Name [1] IA5String, - dNSName [2] IA5String, --- x400Address [3] ORAddress, --- directoryName [4] Name, --- ediPartyName [5] EDIPartyName, - uniformResourceIdentifier [6] IA5String, - iPAddress [7] OCTET STRING, - registeredID [8] OBJECT IDENTIFIER +-- otherName [0] IMPLICIT INSTANCE OF OTHER-NAME, + rfc822Name [1] IMPLICIT IA5String, + dNSName [2] IMPLICIT IA5String, +-- x400Address [3] IMPLICIT ORAddress, +-- directoryName [4] IMPLICIT Name, +-- ediPartyName [5] IMPLICIT EDIPartyName, + uniformResourceIdentifier [6] IMPLICIT IA5String, + iPAddress [7] IMPLICIT OCTET STRING, + registeredID [8] IMPLICIT OBJECT IDENTIFIER } -- OTHER-NAME ::= TYPE-IDENTIFIER -- -- EDIPartyName ::= SEQUENCE { --- nameAssigner [0] DirectoryString{ub-name} OPTIONAL, --- partyName [1] DirectoryString{ub-name} +-- nameAssigner [0] IMPLICIT DirectoryString{ub-name} OPTIONAL, +-- partyName [1] IMPLICIT DirectoryString{ub-name} -- } -- -- issuerAltName EXTENSION ::= { @@ -191,16 +191,16 @@ BasicConstraintsSyntax ::= SEQUENCE { -- } NameConstraintsSyntax ::= SEQUENCE { - permittedSubtrees [0] GeneralSubtrees OPTIONAL, - excludedSubtrees [1] GeneralSubtrees OPTIONAL + permittedSubtrees [0] IMPLICIT GeneralSubtrees OPTIONAL, + excludedSubtrees [1] IMPLICIT GeneralSubtrees OPTIONAL } GeneralSubtrees ::= SEQUENCE SIZE (1..MAX) OF GeneralSubtree GeneralSubtree ::= SEQUENCE { base GeneralName, - minimum [0] BaseDistance DEFAULT 0, - maximum [1] BaseDistance OPTIONAL + minimum [0] IMPLICIT BaseDistance DEFAULT 0, + maximum [1] IMPLICIT BaseDistance OPTIONAL } BaseDistance ::= INTEGER(0..MAX) @@ -211,8 +211,8 @@ BaseDistance ::= INTEGER(0..MAX) -- } PolicyConstraintsSyntax ::= SEQUENCE { - requireExplicitPolicy [0] SkipCerts OPTIONAL, - inhibitPolicyMapping [1] SkipCerts OPTIONAL + requireExplicitPolicy [0] IMPLICIT SkipCerts OPTIONAL, + inhibitPolicyMapping [1] IMPLICIT SkipCerts OPTIONAL } SkipCerts ::= INTEGER(0..MAX) @@ -254,29 +254,29 @@ HoldInstruction ::= OBJECT IDENTIFIER CRLScopeSyntax ::= SEQUENCE SIZE (1..MAX) OF PerAuthorityScope PerAuthorityScope ::= SEQUENCE { - authorityName [0] GeneralName OPTIONAL, - distributionPoint [1] DistributionPointName OPTIONAL, - onlyContains [2] OnlyCertificateTypes OPTIONAL, - onlySomeReasons [4] ReasonFlags OPTIONAL, - serialNumberRange [5] NumberRange OPTIONAL, - subjectKeyIdRange [6] NumberRange OPTIONAL, - nameSubtrees [7] GeneralNames OPTIONAL, - baseRevocationInfo [9] BaseRevocationInfo OPTIONAL + authorityName [0] IMPLICIT GeneralName OPTIONAL, + distributionPoint [1] IMPLICIT DistributionPointName OPTIONAL, + onlyContains [2] IMPLICIT OnlyCertificateTypes OPTIONAL, + onlySomeReasons [4] IMPLICIT ReasonFlags OPTIONAL, + serialNumberRange [5] IMPLICIT NumberRange OPTIONAL, + subjectKeyIdRange [6] IMPLICIT NumberRange OPTIONAL, + nameSubtrees [7] IMPLICIT GeneralNames OPTIONAL, + baseRevocationInfo [9] IMPLICIT BaseRevocationInfo OPTIONAL } OnlyCertificateTypes ::= BIT STRING { userPublicKey(0), cA(1), userAttribute(2), aA(3), sOAPublicKey(4)} NumberRange ::= SEQUENCE { - startingNumber [0] INTEGER OPTIONAL, - endingNumber [1] INTEGER OPTIONAL, + startingNumber [0] IMPLICIT INTEGER OPTIONAL, + endingNumber [1] IMPLICIT INTEGER OPTIONAL, modulus INTEGER OPTIONAL } BaseRevocationInfo ::= SEQUENCE { - cRLStreamIdentifier [0] CRLStreamIdentifier OPTIONAL, - cRLNumber [1] CRLNumber, - baseThisUpdate [2] GeneralizedTime + cRLStreamIdentifier [0] IMPLICIT CRLStreamIdentifier OPTIONAL, + cRLNumber [1] IMPLICIT CRLNumber, + baseThisUpdate [2] IMPLICIT GeneralizedTime } -- statusReferrals EXTENSION ::= { @@ -287,18 +287,18 @@ BaseRevocationInfo ::= SEQUENCE { StatusReferrals ::= SEQUENCE SIZE (1..MAX) OF StatusReferral StatusReferral ::= CHOICE { - cRLReferral [0] CRLReferral --- cRLReferral [0] CRLReferral, --- otherReferral [1] INSTANCE OF OTHER-REFERRAL + cRLReferral [0] IMPLICIT CRLReferral +-- cRLReferral [0] IMPLICIT CRLReferral, +-- otherReferral [1] IMPLICIT INSTANCE OF OTHER-REFERRAL } CRLReferral ::= SEQUENCE { - issuer [0] GeneralName OPTIONAL, - location [1] GeneralName OPTIONAL, - deltaRefInfo [2] DeltaRefInfo OPTIONAL, + issuer [0] IMPLICIT GeneralName OPTIONAL, + location [1] IMPLICIT GeneralName OPTIONAL, + deltaRefInfo [2] IMPLICIT DeltaRefInfo OPTIONAL, cRLScope CRLScopeSyntax, - lastUpdate [3] GeneralizedTime OPTIONAL, - lastChangedCRL [4] GeneralizedTime OPTIONAL + lastUpdate [3] IMPLICIT GeneralizedTime OPTIONAL, + lastChangedCRL [4] IMPLICIT GeneralizedTime OPTIONAL } DeltaRefInfo ::= SEQUENCE { @@ -340,14 +340,14 @@ DeltaInformation ::= SEQUENCE { CRLDistPointsSyntax ::= SEQUENCE SIZE (1..MAX) OF DistributionPoint DistributionPoint ::= SEQUENCE { - distributionPoint [0] DistributionPointName OPTIONAL, - reasons [1] ReasonFlags OPTIONAL, - cRLIssuer [2] GeneralNames OPTIONAL + distributionPoint [0] IMPLICIT DistributionPointName OPTIONAL, + reasons [1] IMPLICIT ReasonFlags OPTIONAL, + cRLIssuer [2] IMPLICIT GeneralNames OPTIONAL } DistributionPointName ::= CHOICE { - fullName [0] GeneralNames, - nameRelativeToCRLIssuer [1] RelativeDistinguishedName + fullName [0] IMPLICIT GeneralNames, + nameRelativeToCRLIssuer [1] IMPLICIT RelativeDistinguishedName } ReasonFlags ::= BIT STRING { @@ -364,14 +364,14 @@ IssuingDistPointSyntax ::= SEQUENCE { -- If containsUserPublicKeyCerts, containsCACerts, containsUserAttributeCerts, -- containsAACerts, and containsSOAPublicKeyCerts s are all absent, or not set to TRUE, (), -- the CRL covers allthese certificate types - distributionPoint [0] DistributionPointName OPTIONAL, - containsUserPublicKeyCerts [1] BOOLEAN DEFAULT FALSE, - containsCACerts [2] BOOLEAN DEFAULT FALSE, - onlySomeReasons [3] ReasonFlags OPTIONAL, - indirectCRL [4] BOOLEAN DEFAULT FALSE, - containsUserAttributeCerts [5] BOOLEAN DEFAULT FALSE, - containsAACerts [6] BOOLEAN DEFAULT FALSE, - containsSOAPublicKeyCerts [7] BOOLEAN DEFAULT FALSE + distributionPoint [0] IMPLICIT DistributionPointName OPTIONAL, + containsUserPublicKeyCerts [1] IMPLICIT BOOLEAN DEFAULT FALSE, + containsCACerts [2] IMPLICIT BOOLEAN DEFAULT FALSE, + onlySomeReasons [3] IMPLICIT ReasonFlags OPTIONAL, + indirectCRL [4] IMPLICIT BOOLEAN DEFAULT FALSE, + containsUserAttributeCerts [5] IMPLICIT BOOLEAN DEFAULT FALSE, + containsAACerts [6] IMPLICIT BOOLEAN DEFAULT FALSE, + containsSOAPublicKeyCerts [7] IMPLICIT BOOLEAN DEFAULT FALSE } -- certificateIssuer EXTENSION ::= { @@ -418,19 +418,19 @@ BaseCRLNumber ::= CRLNumber -- } -- -- CertificateAssertion ::= SEQUENCE { --- serialNumber [0] CertificateSerialNumber OPTIONAL, --- issuer [1] Name OPTIONAL, --- subjectKeyIdentifier [2] SubjectKeyIdentifier OPTIONAL, --- authorityKeyIdentifier [3] AuthorityKeyIdentifier OPTIONAL, --- certificateValid [4] Time OPTIONAL, --- privateKeyValid [5] GeneralizedTime OPTIONAL, --- subjectPublicKeyAlgID [6] OBJECT IDENTIFIER OPTIONAL, --- keyUsage [7] KeyUsage OPTIONAL, --- subjectAltName [8] AltNameType OPTIONAL, --- policy [9] CertPolicySet OPTIONAL, --- pathToName [10] Name OPTIONAL, --- subject [11] Name OPTIONAL, --- nameConstraints [12] NameConstraintsSyntax OPTIONAL +-- serialNumber [0] IMPLICIT CertificateSerialNumber OPTIONAL, +-- issuer [1] IMPLICIT Name OPTIONAL, +-- subjectKeyIdentifier [2] IMPLICIT SubjectKeyIdentifier OPTIONAL, +-- authorityKeyIdentifier [3] IMPLICIT AuthorityKeyIdentifier OPTIONAL, +-- certificateValid [4] IMPLICIT Time OPTIONAL, +-- privateKeyValid [5] IMPLICIT GeneralizedTime OPTIONAL, +-- subjectPublicKeyAlgID [6] IMPLICIT OBJECT IDENTIFIER OPTIONAL, +-- keyUsage [7] IMPLICIT KeyUsage OPTIONAL, +-- subjectAltName [8] IMPLICIT AltNameType OPTIONAL, +-- policy [9] IMPLICIT CertPolicySet OPTIONAL, +-- pathToName [10] IMPLICIT Name OPTIONAL, +-- subject [11] IMPLICIT Name OPTIONAL, +-- nameConstraints [12] IMPLICIT NameConstraintsSyntax OPTIONAL -- } -- -- AltNameType ::= CHOICE { @@ -449,8 +449,8 @@ BaseCRLNumber ::= CRLNumber -- } -- -- CertificatePairExactAssertion ::= SEQUENCE { --- issuedToThisCAAssertion [0] CertificateExactAssertion OPTIONAL, --- issuedByThisCAAssertion [1] CertificateExactAssertion OPTIONAL +-- issuedToThisCAAssertion [0] IMPLICIT CertificateExactAssertion OPTIONAL, +-- issuedByThisCAAssertion [1] IMPLICIT CertificateExactAssertion OPTIONAL -- } -- (WITH COMPONENTS { -- ..., @@ -466,8 +466,8 @@ BaseCRLNumber ::= CRLNumber -- } -- -- CertificatePairAssertion ::= SEQUENCE { --- issuedToThisCAAssertion [0] CertificateAssertion OPTIONAL, --- issuedByThisCAAssertion [1] CertificateAssertion OPTIONAL +-- issuedToThisCAAssertion [0] IMPLICIT CertificateAssertion OPTIONAL, +-- issuedByThisCAAssertion [1] IMPLICIT CertificateAssertion OPTIONAL -- } -- (WITH COMPONENTS { -- ..., @@ -495,12 +495,12 @@ BaseCRLNumber ::= CRLNumber -- -- CertificateListAssertion ::= SEQUENCE { -- issuer Name OPTIONAL, --- minCRLNumber [0] CRLNumber OPTIONAL, --- maxCRLNumber [1] CRLNumber OPTIONAL, +-- minCRLNumber [0] IMPLICIT CRLNumber OPTIONAL, +-- maxCRLNumber [1] IMPLICIT CRLNumber OPTIONAL, -- reasonFlags ReasonFlags OPTIONAL, -- dateAndTime Time OPTIONAL, --- distributionPoint [2] DistributionPointName OPTIONAL, --- authorityKeyIdentifier [3] AuthorityKeyIdentifier OPTIONAL +-- distributionPoint [2] IMPLICIT DistributionPointName OPTIONAL, +-- authorityKeyIdentifier [3] IMPLICIT AuthorityKeyIdentifier OPTIONAL -- } -- -- algorithmIdentifierMatch MATCHING-RULE ::= { |