diff options
| -rw-r--r-- | asn1/acp133/Makefile | 17 | ||||
| -rw-r--r-- | asn1/acp133/acp133.asn | 185 | ||||
| -rw-r--r-- | asn1/acp133/acp133.cnf | 164 | ||||
| -rw-r--r-- | asn1/acp133/packet-acp133-template.c | 146 | ||||
| -rw-r--r-- | asn1/acp133/packet-acp133-template.h | 31 | ||||
| -rw-r--r-- | asn1/dop/dop.asn | 8 | ||||
| -rw-r--r-- | asn1/x411/x411-exp.cnf | 12 | ||||
| -rw-r--r-- | asn1/x411/x411.cnf | 36 | ||||
| -rw-r--r-- | asn1/x509if/packet-x509if-template.c | 2 | ||||
| -rw-r--r-- | asn1/x509if/x509if-exp.cnf | 2 | ||||
| -rw-r--r-- | asn1/x509if/x509if.cnf | 22 | ||||
| -rw-r--r-- | asn1/x509sat/packet-x509sat-template.c | 30 | ||||
| -rw-r--r-- | asn1/x509sat/x509sat.cnf | 64 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-x411.c | 138 | ||||
| -rw-r--r-- | epan/dissectors/packet-x411.h | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-x509if.c | 52 | ||||
| -rw-r--r-- | epan/dissectors/packet-x509if.h | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-x509sat.c | 90 | ||||
| -rw-r--r-- | epan/dissectors/packet-x509sat.h | 2 |
20 files changed, 939 insertions, 73 deletions
diff --git a/asn1/acp133/Makefile b/asn1/acp133/Makefile new file mode 100644 index 0000000000..944ad2e5c1 --- /dev/null +++ b/asn1/acp133/Makefile @@ -0,0 +1,17 @@ +# $Id: Makefile 15679 2005-09-04 16:22:12Z etxrab $ + +DISSECTOR_FILES=packet-acp133.c packet-acp133.h + +all: generate_dissector + +generate_dissector: $(DISSECTOR_FILES) + +$(DISSECTOR_FILES): ../../tools/asn2eth.py acp133.asn packet-acp133-template.c packet-acp133-template.h acp133.cnf + python ../../tools/asn2eth.py -X -b -e -p acp133 -c acp133.cnf -s packet-acp133-template acp133.asn + +clean: + rm -f parsetab.py $(DISSECTOR_FILES) + +copy_files: generate_dissector + cp $(DISSECTOR_FILES) ../../epan/dissectors + diff --git a/asn1/acp133/acp133.asn b/asn1/acp133/acp133.asn new file mode 100644 index 0000000000..565e21ea49 --- /dev/null +++ b/asn1/acp133/acp133.asn @@ -0,0 +1,185 @@ +ACP133CommonContent { joint-iso-ccitt(2) country(16) us(840) organization(1) gov(101) dod(2) ds(2) module(0) commonContent(2) editionB (3) } +DEFINITIONS ::= +BEGIN +IMPORTS + GeneralNames, CertificateAssertion + FROM CertificateExtensions {joint-iso-ccitt ds(5) + module(1) certificateExtensions(26) 0} + AlgorithmIdentifier + --== + FROM AuthenticationFramework {joint-iso-itu-t ds(5) module(1) + authenticationFramework(7) 3} + ContentLength, EncodedInformationTypesConstraints, ExtendedContentType, + ORAddress, ORName, RequestedDeliveryMethod, SecurityContext + --== + FROM MTSAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0) + mts-abstract-service(1) version-1999(1)} + Name + --== + FROM InformationFramework {joint-iso-itu-t ds(5) module(1) + informationFramework(1) 3}; + + + +ACPPreferredDelivery ::= ENUMERATED { smtp(0), acp127(1), mhs(2) } + +ALType ::= INTEGER { aig(0), type(1), cad(2), taskforce(3), dag(4) } + +Community ::= ENUMERATED { genser(0), si(1), both(2) } + +OnSupported ::= BIT STRING { acp127-nn(0), acp127-pn(1), acp127-tn(2) } + +ACPLegacyFormat ::= INTEGER { + janap128(0), + acp126(1), + doi103(2), + doi103-special(3), + acp127(4), + acp127-converted(5), + reserved-1(6), -- hold for ACP127Standard if needed + acp127-state(7), + acp127-modified(8), + socomm-special(9), + socomm-narrative(10), + reserved-2(11), -- hold for SOCOMMNarrativeTTY if needed + socomm-narrative-special(12), + socomm-data(13), + socomm-internal(14), + socomm-external(15) } + -- Note: Values 32 through 48 are not defined + -- by this ACP and may be used nationally or + -- bilaterally. + + +Addressees ::= SEQUENCE OF PrintableString (SIZE (1..55)) + +Classification ::= ENUMERATED { unmarked(0), unclassified(1), restricted(2), +confidential(3), secret(4), top-secret(5) } + +DistributionCode ::= PrintableString + +JPEG ::= OCTET STRING -- a JPEG image + +MonthlyUKMs ::= --SIGNED { SEQUENCE OF UKMEntry }-- SEQUENCE { + ukm-entries SEQUENCE OF UKMEntry, + algorithm-identifier AlgorithmIdentifier, + encrypted BIT STRING +} + +Remarks ::= SEQUENCE OF PrintableString + +RIParameters ::= SET { + rI [0] PrintableString, + rIType [1] ENUMERATED + { normal(0), off-line(1), partTimeTerminal(2) }, + minimize [2] BOOLEAN, -- not used any more -- + sHD [3] PrintableString, + classification [4] Classification +} + +UKMEntry ::= SEQUENCE { + tag PairwiseTag, + ukm OCTET STRING +} + +-- these are imported directly from SDN.701 + +PairwiseTag ::= SEQUENCE { + kmid Kmid, + edition INTEGER --(1..ub-edition-size)--, + date UTCTime OPTIONAL } + +Kmid ::= OCTET STRING + +MLReceiptPolicy ::= CHOICE { + none [0] NULL, + insteadOf [1] SEQUENCE -- (SIZE (1..ub-insteadOf)) + OF GeneralNames, + inAdditionTo [2] SEQUENCE --(SIZE (1..ub-inAdditionTo)) + OF GeneralNames } + +-- X.402 syntaxes imported here to save a separate dissector + +-- DL Submit Permission +DLSubmitPermission ::= CHOICE { + individual [0] ORName, + member-of-dl [1] ORName, + pattern-match [2] ORNamePattern, + member-of-group [3] Name +} + +ORNamePattern ::= ORName + +--any-user-may-submit DLSubmitPermission ::= +-- pattern-match:{built-in-standard-attributes {}} + +-- DL Policy +DLPolicy ::= SET { + report-propagation + [0] INTEGER {previous-dl-or-originator(0), dl-owner(1), + both-previous-and-owner(2)} DEFAULT previous-dl-or-originator, + report-from-dl + [1] INTEGER {whenever-requested(0), when-no-propagation(1)} + DEFAULT whenever-requested, + originating-MTA-report + [2] INTEGER {unchanged(0), report(2), non-delivery-report(3), + audited-report(4)} DEFAULT unchanged, + originator-report + [3] INTEGER {unchanged(0), no-report(1), report(2), non-delivery-report(3)} + DEFAULT unchanged, + return-of-content + [4] ENUMERATED {unchanged(0), content-return-not-requested(1), + content-return-requested(2)} DEFAULT unchanged, + priority + [5] INTEGER {unchanged(0), normal(1), non-urgent(2), urgent(3)} + DEFAULT unchanged, + disclosure-of-other-recipients + [6] ENUMERATED {unchanged(0), + disclosure-of-other-recipients-prohibited(1), + disclosure-of-other-recipients-allowed(2)} + DEFAULT unchanged, + implicit-conversion-prohibited + [7] ENUMERATED {unchanged(0), implicit-conversion-allowed(1), + implicit-conversion-prohibited(2)} DEFAULT unchanged, + conversion-with-loss-prohibited + [8] ENUMERATED {unchanged(0), conversion-with-loss-allowed(1), + conversion-with-loss-prohibited(2)} DEFAULT unchanged, + further-dl-expansion-allowed [9] BOOLEAN DEFAULT TRUE, + originator-requested-alternate-recipient-removed [10] BOOLEAN DEFAULT TRUE, + proof-of-delivery + [11] INTEGER {dl-expansion-point(0), dl-members(1), both(2), neither(3)} + DEFAULT dl-members, + requested-delivery-method + [12] CHOICE {unchanged [0] NULL, + removed [1] NULL, + replaced RequestedDeliveryMethod} OPTIONAL -- DEFAULT unchanged:NULL --, + token-encryption-algorithm-preference + [13] SEQUENCE OF AlgorithmInformation OPTIONAL, + token-signature-algorithm-preference + [14] SEQUENCE OF AlgorithmInformation OPTIONAL, + ... +} + +AlgorithmInformation ::= SEQUENCE { + algorithm-identifier [0] AlgorithmIdentifier, + originator-certificate-selector [1] CertificateAssertion OPTIONAL, + recipient-certificate-selector [2] CertificateAssertion OPTIONAL +} + +-- OR-Address with Capabilities +AddressCapabilities ::= SEQUENCE { + description GeneralString OPTIONAL, + address ORAddress, + capabilities SET OF Capability +} + +Capability ::= SET { + content-types + [0] SET OF ExtendedContentType OPTIONAL, + maximum-content-length [1] ContentLength OPTIONAL, + encoded-information-types-constraints + [2] EncodedInformationTypesConstraints OPTIONAL, + security-labels [3] SecurityContext OPTIONAL +} + +END diff --git a/asn1/acp133/acp133.cnf b/asn1/acp133/acp133.cnf new file mode 100644 index 0000000000..a2c7998f66 --- /dev/null +++ b/asn1/acp133/acp133.cnf @@ -0,0 +1,164 @@ +# acp133.cnf +# ACP133 conformation file + +#.MODULE_IMPORT +CertificateExtensions x509ce +AuthenticationFramework x509af +InformationFramework x509if +MTSAbstractService x411 + +#.INCLUDE ../x509ce/x509ce-exp.cnf +#.INCLUDE ../x509if/x509if-exp.cnf +#.INCLUDE ../x509af/x509af-exp.cnf +#.INCLUDE ../x411/x411-exp.cnf + +#.PDU +ACPPreferredDelivery +ALType +Community +OnSupported +ACPLegacyFormat +Addressees +DistributionCode +JPEG +MonthlyUKMs +RIParameters +Kmid + +#.REGISTER + +# X.402 + +# ContentLength B "2.6.5.2.0" "id-at-mhs-maximum-content-length" - see x411.cnf +# ExtendedContentType B "2.6.5.2.1" "id-at-mhs-deliverable-content-types" - see x411.cnf +# ExtendedEncodedInformationType B "2.6.5.2.2" "id-at-mhs-exclusively-acceptable-eits" - see x411.cnf +# ORName B "2.6.5.2.3" "id-at-mhs-dl-members" - see x411.cnf +DLSubmitPermission B "2.6.5.2.4" "id-at-mhs-dl-submit-permissions" +# DistinguishedName B "2.6.5.2.5" "id-at-mhs-message-store-dn" - see x509if.cnf +# ORAddress B "2.6.5.2.6" "id-at-mhs-or-addresses" - see x411.cnf +# ObjectIdentifier B "2.6.5.2.8" "id-at-mhs-supported-automatic-actions" - see x509sat.cnf +# ExtendedContentType B "2.6.5.2.9" "id-at-mhs-supported-content-types" - see x411.cnf +# ObjectIdentifier B "2.6.5.2.10" "id-at-mhs-supported-attributes" - see x509sat.cnf +# ObjectIdentifier B "2.6.5.2.11" "id-at-mhs-supported-matching-rules" - see x509sat.cnf +# ORName B "2.6.5.2.12" "id-at-mhs-dl-archive-service" - see x411.cnf +DLPolicy B "2.6.5.2.13" "id-at-mhs-dl-policy" +# DistinguishedName B "2.6.5.2.14" "id-at-mhs-dl-related-lists" - see x509if.cnf +# ORName B "2.6.5.2.15" "id-at-mhs-dl-subscription-service" - see x411.cnf +AddressCapabilities B "2.6.5.2.16" "id-at-mhs-or-addresses-with-capabilities" +# ExtendedEncodedInformationType B "2.6.5.2.17" "id-at-mhs-acceptable-eits" see x411.cnf +# ExtendedEncodedInformationType B "2.6.5.2.18" "id-at-mhs-unacceptable-eits" - see x411.cnf +Capability B "2.6.5.2.19" "id-at-mhs-deliverable-classes" + + +# SDN.701 +Kmid B "2.16.840.1.101.2.1.5.14" "id-at-alid" +MonthlyUKMs B "2.16.840.1.101.2.1.5.20" "id-at-janUKMs" +MonthlyUKMs B "2.16.840.1.101.2.1.5.21" "id-at-febUKMs" +MonthlyUKMs B "2.16.840.1.101.2.1.5.22" "id-at-marUKMs" +MonthlyUKMs B "2.16.840.1.101.2.1.5.23" "id-at-aprUKMs" +MonthlyUKMs B "2.16.840.1.101.2.1.5.24" "id-at-mayUKMs" +MonthlyUKMs B "2.16.840.1.101.2.1.5.25" "id-at-junUKMs" +MonthlyUKMs B "2.16.840.1.101.2.1.5.26" "id-at-julUKMs" +MonthlyUKMs B "2.16.840.1.101.2.1.5.27" "id-at-augUKMs" +MonthlyUKMs B "2.16.840.1.101.2.1.5.28" "id-at-sepUKMs" +MonthlyUKMs B "2.16.840.1.101.2.1.5.29" "id-at-octUKMs" +MonthlyUKMs B "2.16.840.1.101.2.1.5.30" "id-at-novUKMs" +MonthlyUKMs B "2.16.840.1.101.2.1.5.31" "id-at-decUKMs" +# ORName B "2.16.840.1.101.2.1.5.47" "id-at-aLExemptedAddressProcessor - see x411.cnf + +# ACP133 +# DistinguishedName B "2.16.840.1.101.2.2.1.3" "id-at-alternateRecipient" - see x509if.cnf +# DistinguishedName B "2.16.840.1.101.2.2.1.4" "id-at-associatedOrganization" - see x509if.cnf +# DistinguishedName B "2.16.840.1.101.2.2.1.6" "id-at-associatedPLA" - see x509if.cnf +# DirectoryString B "2.16.840.1.101.2.2.1.45" "id-at-releaseAuthorityName" - see x509sat.cnf +Addressees B "2.16.840.1.101.2.2.1.46" "id-at-actionAddressees" +Addressees B "2.16.840.1.101.2.2.1.47" "id-at-additionalAddressees" +Addressees B "2.16.840.1.101.2.2.1.48" "id-at-additionalSecondPartyAddressees" +# DistinguishedName B "2.16.840.1.101.2.2.1.49" "id-at-aliasPointer" - see x509if.cnf +Addressees B "2.16.840.1.101.2.2.1.50" "id-at-allowableOriginators" +#PrintableString B "2.16.840.1.101.2.2.1.51" "id-at-cognizantAuthority" - see x509sat.cnf +Community B "2.16.840.1.101.2.2.1.52" "id-at-community" +# PrintableString B "2.16.840.1.101.2.2.1.53" "id-at-accountingCode" - see x509sat.cnf +# Boolean B "2.16.840.1.101.2.2.1.54" "id-at-dualRoute" - see x509sat.cnf +# GeneralizedTime B "2.16.840.1.101.2.2.1.55" "id-at-effectiveDate" - see x509sat.cnf +Classification B "2.16.840.1.101.2.2.1.56" "id-at-entryClassification" +# GeneralizedTime B "2.16.840.1.101.2.2.1.57" "id-at-expirationDate" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.58" "id-at-hostOrgACP127" - see x509sat.cnf +Addressees B "2.16.840.1.101.2.2.1.59" "id-at-infoAddressees" +# GeneralizedTime B "2.16.840.1.101.2.2.1.60" "id-at-lastRecapDate" - see x509sat.cnf +# DistinguishedName B "2.16.840.1.101.2.2.1.61" "id-at-listPointer" - see x509if.cnf +# PrintableString B "2.16.840.1.101.2.2.1.62" "id-at-lmf" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.63" "id-at-longTitle" - see x509sat.cnf +# Boolean B "2.16.840.1.101.2.2.1.64" "id-at-minimize" - see x509sat.cnf +# Boolean B "2.16.840.1.101.2.2.1.65" "id-at-minimizeOverride" - see x509sat.cnf +Classification B "2.16.840.1.101.2.2.1.67" "id-at-nameClassification" +# PrintableString B "2.16.840.1.101.2.2.1.68" "id-at-nationality" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.68.1" "id-at-collectiveNationality" - see x509sat.cnf +# Boolean B "2.16.840.1.101.2.2.1.69" "id-at-transferStation" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.70" "id-at-plaNameACP127" - see x509sat.cnf +Addressees B "2.16.840.1.101.2.2.1.71" "id-at-plaAddressees" +# Boolean B "2.16.840.1.101.2.2.1.72" "id-at-plaReplace" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.73" "id-at-primarySpellingACP127" - see x509sat.cnf +# Boolean B "2.16.840.1.101.2.2.1.74" "id-at-publish" - see x509sat.cnf +# GeneralizedTime B "2.16.840.1.101.2.2.1.75" "id-at-recapDueDate" - see x509sat.cnf +Remarks B "2.16.840.1.101.2.2.1.76" "id-at-remarks" +# PrintableString B "2.16.840.1.101.2.2.1.77" "id-at-rI" - see x509sat.cnf +Classification B "2.16.840.1.101.2.2.1.78" "id-at-rIClassification" +RIParameters B "2.16.840.1.101.2.2.1.79" "id-at-rIInfo" +Addressees B "2.16.840.1.101.2.2.1.80" "id-at-secondPartyAddressees" +# Boolean B "2.16.840.1.101.2.2.1.81" "id-at-section" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.82" "id-at-serviceOrAgency" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.83" "id-at-sHD" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.84" "id-at-shortTitle" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.85" "id-at-sigad" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.86" "id-at-spot" - see x509sat.cnf +# Boolean B "2.16.840.1.101.2.2.1.87" "id-at-tARE" - see x509sat.cnf +# TelephoneNumber B "2.16.840.1.101.2.2.1.94" "id-at-aCPMobileTelephoneNumber" - see x509sat.cnf +# TelephoneNumber B "2.16.840.1.101.2.2.1.95" "id-at-aCPPagerTelephoneNumber" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.96" "id-at-tCC" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.97" "id-at-tRC" - see x509sat.cnf +DistributionCode B "2.16.840.1.101.2.2.1.104" "id-at-distributionCodeAction" +DistributionCode B "2.16.840.1.101.2.2.1.105" "id-at-distributionCodeInfo" +# PrintableString B "2.16.840.1.101.2.2.1.106" "id-at-accessCodes" - see x509sat.cnf +# GraphicString B "2.16.840.1.101.2.2.1.107" "id-at-accessSchema" - see x509sat.cnf +ACPPreferredDelivery B "2.16.840.1.101.2.2.1.108" "id-at-aCPPreferredDelivery" +# TelephoneNumber B "2.16.840.1.101.2.2.1.109" "id-at-aCPTelephoneFaxNumber" - see x509sat.cnf +# DistinguishedName B "2.16.840.1.101.2.2.1.110" "id-at-administrator" - see x509if.cnf +# DistinguishedName B "2.16.840.1.101.2.2.1.111" "id-at-aigsExpanded" - see x509if.cnf +ALType B "2.16.840.1.101.2.2.1.112" "id-at-aLType" +# DistinguishedName B "2.16.840.1.101.2.2.1.113" "id-at-associatedAL" - see x509if.cnf +# DistinguishedName B "2.16.840.1.101.2.2.1.114" "id-at-copyMember" - see x509if.cnf +# ObjectIdentifier B "2.16.840.1.101.2.2.1.115" "id-at-gatewayType" - see x509sat.cnf +# ObjectIdentifier B "2.16.840.1.101.2.2.1.116" "id-at-ghpType" - see x509sat.cnf +# DistinguishedName B "2.16.840.1.101.2.2.1.117" "id-at-guard" - see x509if.cnf +# DirectoryString B "2.16.840.1.101.2.2.1.118" "id-at-mailDomains" - see x509sat.cnf +# TelephoneNumber B "2.16.840.1.101.2.2.1.119" "id-at-militaryFacsimileNumber" - see x509sat.cnf +# TelephoneNumber B "2.16.840.1.101.2.2.1.119.1" "id-at-collectiveMilitaryFacsimileNumber" - see x509sat.cnf +# TelephoneNumber B "2.16.840.1.101.2.2.1.120" "id-at-militaryTelephoneNumber" - see x509sat.cnf +# TelephoneNumber B "2.16.840.1.101.2.2.1.120.1" "id-at-collectiveMilitaryTelephoneNumber" - see x509sat.cnf +# DistingishedName B "2.16.840.1.101.2.2.1.121" "id-at-networkDN" - see x509if.cnf +# GraphicString B "2.16.840.1.101.2.2.1.122" "id-at-networkSchema" - see x509sat.cnf +OnSupported B "2.16.840.1.101.2.2.1.123" "id-at-onSupported" +# DirectoryString B "2.16.840.1.101.2.2.1.124" "id-at-operationName" - see x509sat.cnf +# DirectoryString B "2.16.840.1.101.2.2.1.125" "id-at-positionNumber" - see x509sat.cnf +# DirectoryString B "2.16.840.1.101.2.2.1.126" "id-at-proprietaryMailboxes" - see x509sat.cnf +# TelephoneNumber B "2.16.840.1.101.2.2.1.127" "id-at-secureFacsimileNumber" - see x509sat.cnf +# TelephoneNumber B "2.16.840.1.101.2.2.1.127.1" "id-at-collectiveSecureFacsimileNumber" - see x509sat.cnf +# TelephoneNumber B "2.16.840.1.101.2.2.1.128" "id-at-secureTelephoneNumber" - see x509sat.cnf +# TelephoneNumber B "2.16.840.1.101.2.2.1.128.1" "id-at-collectiveSecureTelephoneNumber" - see x509sat.cnf +# DirectoryString B "2.16.840.1.101.2.2.1.129" "id-at-serviceNumber" - see x509sat.cnf +# DirectoryString B "2.16.840.1.101.2.2.1.133" "id-at-rank" - see x509sat.cnf +# B "2.16.840.1.101.2.2.1.134" "id-at-misc-collectives" +# ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" - see x411.cnf +MLReceiptPolicy B "2.16.840.1.101.2.2.1.135" "id-at-aLReceiptPolicy" +# DistinguishedName B "2.16.840.1.101.2.2.1.138" "id-at-plasServed" - see x509if.cnf +#DistinguishedName B "2.16.840.1.101.2.2.1.139" "id-at-deployed" - see x509if.cnf +# DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" - see x509if.cnf +ACPLegacyFormat B "2.16.840.1.101.2.2.1.142" "id-at-aCPLegacyFormat" +# DirectoryString B "2.16.840.1.101.2.2.1.143" "id-at-adminConversion" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.144" "id-at-tCCG" - see x509sat.cnf +# DirectoryString B "2.16.840.1.101.2.2.1.145" "id-at-usdConversion" - see x509sat.cnf +JPEG B "2.16.840.1.101.2.2.1.146" "id-at-aCPNetwAccessSchemaEdB" +JPEG B "2.16.840.1.101.2.2.1.147" "id-at-aCPNetworkSchemaEdB" + + diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c new file mode 100644 index 0000000000..b5d4ec69e2 --- /dev/null +++ b/asn1/acp133/packet-acp133-template.c @@ -0,0 +1,146 @@ +/* packet-acp133.c + * Routines for ACP133 specific syntaxes in X.500 packet dissection + * Graeme Lunt 2005 + * + * $Id: packet-acp133-template.c 16689 2005-12-05 23:00:03Z etxrab $ + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <glib.h> +#include <epan/packet.h> +#include <epan/conversation.h> + +#include <stdio.h> +#include <string.h> + +#include "packet-ber.h" + +#include "packet-x509af.h" +#include "packet-x509if.h" +#include "packet-x509ce.h" +#include "packet-x411.h" + +#include "packet-acp133.h" + +#define PNAME "ACP133 Attribute Syntaxes" +#define PSNAME "ACP133" +#define PFNAME "acp133" + +/* Initialize the protocol and registered fields */ +int proto_acp133 = -1; + + +#include "packet-acp133-hf.c" + +/* Initialize the subtree pointers */ +static gint ett_acp133 = -1; +#include "packet-acp133-ett.c" + +#include "packet-acp133-fn.c" + + +/*--- proto_register_acp133 -------------------------------------------*/ +void proto_register_acp133(void) { + + /* List of fields */ + static hf_register_info hf[] = + { +#include "packet-acp133-hfarr.c" + }; + + /* List of subtrees */ + static gint *ett[] = { + &ett_acp133, +#include "packet-acp133-ettarr.c" + }; + + /* Register protocol */ + proto_acp133 = proto_register_protocol(PNAME, PSNAME, PFNAME); + + /* Register fields and subtrees */ + proto_register_field_array(proto_acp133, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + +} + + +/*--- proto_reg_handoff_acp133 --- */ +void proto_reg_handoff_acp133(void) { + +#include "packet-acp133-dis-tab.c" + + /* X.402 Object Classes */ + register_ber_oid_name("2.6.5.1.0","id-oc-mhs-distribution-list"); + register_ber_oid_name("2.6.5.1.1","id-oc-mhs-message-store"); + register_ber_oid_name("2.6.5.1.2","id-oc-mhs-message-transfer-agent"); + register_ber_oid_name("2.6.5.1.3","id-oc-mhs-user"); + + /* SDN.701 Object Classes */ + register_ber_oid_name("2.16.840.1.101.2.1.4.13", "id-oc-secure-user"); + register_ber_oid_name("2.16.840.1.101.2.1.4.16", "id-oc-ukms"); + + /* ACP133 Object Classes */ + register_ber_oid_name("2.16.840.1.101.2.2.3.26", "id-oc-plaData"); + register_ber_oid_name("2.16.840.1.101.2.2.3.28", "id-oc-cadACP127"); + register_ber_oid_name("2.16.840.1.101.2.2.3.31", "id-oc-mLA"); + register_ber_oid_name("2.16.840.1.101.2.2.3.34", "id-oc-orgACP127"); + register_ber_oid_name("2.16.840.1.101.2.2.3.35", "id-oc-plaCollectiveACP127"); + register_ber_oid_name("2.16.840.1.101.2.2.3.37", "id-oc-routingIndicator"); + register_ber_oid_name("2.16.840.1.101.2.2.3.38", "id-oc-sigintPLA"); + register_ber_oid_name("2.16.840.1.101.2.2.3.39", "id-oc-sIPLA"); + register_ber_oid_name("2.16.840.1.101.2.2.3.40", "id-oc-spotPLA"); + register_ber_oid_name("2.16.840.1.101.2.2.3.41", "id-oc-taskForceACP127"); + register_ber_oid_name("2.16.840.1.101.2.2.3.42", "id-oc-tenantACP127"); + register_ber_oid_name("2.16.840.1.101.2.2.3.47", "id-oc-plaACP127"); + register_ber_oid_name("2.16.840.1.101.2.2.3.52", "id-oc-aliasCommonName"); + register_ber_oid_name("2.16.840.1.101.2.2.3.53", "id-oc-aliasOrganizationalUnit"); + register_ber_oid_name("2.16.840.1.101.2.2.3.54", "id-oc-distributionCodesHandled"); + register_ber_oid_name("2.16.840.1.101.2.2.3.55", "id-oc-distributionCodeDescription"); + register_ber_oid_name("2.16.840.1.101.2.2.3.56", "id-oc-plaUser"); + register_ber_oid_name("2.16.840.1.101.2.2.3.57", "id-oc-addressList"); + register_ber_oid_name("2.16.840.1.101.2.2.3.58", "id-oc-altSpellingACP127"); + register_ber_oid_name("2.16.840.1.101.2.2.3.59", "id-oc-messagingGateway"); + register_ber_oid_name("2.16.840.1.101.2.2.3.60", "id-oc-network"); + register_ber_oid_name("2.16.840.1.101.2.2.3.61", "id-oc-networkInstructions"); + register_ber_oid_name("2.16.840.1.101.2.2.3.62", "id-oc-otherContactInformation"); + register_ber_oid_name("2.16.840.1.101.2.2.3.63", "id-oc-releaseAuthorityPerson"); + register_ber_oid_name("2.16.840.1.101.2.2.3.64", "id-oc-mLAgent"); + register_ber_oid_name("2.16.840.1.101.2.2.3.65", "id-oc-releaseAuthorityPersonA"); + register_ber_oid_name("2.16.840.1.101.2.2.3.66", "id-oc-securePkiUser"); + register_ber_oid_name("2.16.840.1.101.2.2.3.67", "id-oc-dSSCSPLA"); + register_ber_oid_name("2.16.840.1.101.2.2.3.68", "id-oc-aCPNetworkEdB"); + register_ber_oid_name("2.16.840.1.101.2.2.3.69", "id-oc-aCPNetworkInstructionsEdB"); + + /* gateway types */ + register_ber_oid_name("2.16.840.1.101.2.2.5.0", "acp120-acp127"); + register_ber_oid_name("2.16.840.1.101.2.2.5.1", "acp120-janap128"); + register_ber_oid_name("2.16.840.1.101.2.2.5.2", "acp120-mhs"); + register_ber_oid_name("2.16.840.1.101.2.2.5.3", "acp120-mmhs"); + register_ber_oid_name("2.16.840.1.101.2.2.5.4", "acp120-rfc822"); + register_ber_oid_name("2.16.840.1.101.2.2.5.5", "boundaryMTA"); + register_ber_oid_name("2.16.840.1.101.2.2.5.6", "mmhs-mhs"); + register_ber_oid_name("2.16.840.1.101.2.2.5.7", "mmhs-rfc822"); + register_ber_oid_name("2.16.840.1.101.2.2.5.8", "mta-acp127"); + +} diff --git a/asn1/acp133/packet-acp133-template.h b/asn1/acp133/packet-acp133-template.h new file mode 100644 index 0000000000..7c681bc7fd --- /dev/null +++ b/asn1/acp133/packet-acp133-template.h @@ -0,0 +1,31 @@ +/* packet-acp133.h + * Routines for ACP133 specific syntaxes in X.500 packet dissection + * Graeme Lunt 2005 + * + * $Id: packet-acp133-template.h 15680 2005-09-04 20:30:31Z etxrab $ + * + * 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_ACP133_H +#define PACKET_ACP133_H + +/* #include "packet-acp133-exp.h" */ + +#endif /* PACKET_ACP133_H */ diff --git a/asn1/dop/dop.asn b/asn1/dop/dop.asn index f7ddeb0180..626997c7c6 100644 --- a/asn1/dop/dop.asn +++ b/asn1/dop/dop.asn @@ -221,10 +221,10 @@ SupplierAndConsumers ::= SET { --BEGIN -- EXPORTS All ---˙The types and values defined in this module are exported for use in the other ASN.1 modules contained ---˙within the Directory Specifications, and for the use of other applications which will use them to access ---˙Directory services. Other applications may use them for their own purposes, but this will not constrain ---˙extensions and modifications needed to maintain or improve the Directory service. +-- The types and values defined in this module are exported for use in the other ASN.1 modules contained +-- within the Directory Specifications, and for the use of other applications which will use them to access +-- Directory services. Other applications may use them for their own purposes, but this will not constrain +-- extensions and modifications needed to maintain or improve the Directory service. --IMPORTS -- from ITU-T Rec. X.501 | ISO/IEC 9594-2 -- directoryAbstractService, directoryShadowAbstractService, diff --git a/asn1/x411/x411-exp.cnf b/asn1/x411/x411-exp.cnf index 20032c013e..44bb30935b 100644 --- a/asn1/x411/x411-exp.cnf +++ b/asn1/x411/x411-exp.cnf @@ -1,13 +1,19 @@ #.IMPORT_TAG +SecurityContext BER_CLASS_UNI BER_UNI_TAG_SET +EncodedInformationTypesConstraints BER_CLASS_UNI BER_UNI_TAG_SEQUENCE MessageSubmissionEnvelope BER_CLASS_UNI BER_UNI_TAG_SET OtherMessageDeliveryFields BER_CLASS_UNI BER_UNI_TAG_SET +ExtendedContentType BER_CLASS_UNI BER_UNI_TAG_OID +ContentLength BER_CLASS_UNI BER_UNI_TAG_INTEGER MessageDeliveryIdentifier BER_CLASS_APP 4 MessageDeliveryTime BER_CLASS_UNI BER_UNI_TAG_UTCTime SupplementaryInformation BER_CLASS_UNI BER_UNI_TAG_PrintableString +RequestedDeliveryMethod BER_CLASS_UNI BER_UNI_TAG_SEQUENCE OriginatingMTACertificate BER_CLASS_UNI BER_UNI_TAG_SEQUENCE ProofOfSubmission BER_CLASS_UNI BER_UNI_TAG_SEQUENCE ExtendedCertificates BER_CLASS_UNI BER_UNI_TAG_SET ORName BER_CLASS_APP 0 +ORAddress BER_CLASS_UNI BER_UNI_TAG_SEQUENCE UniversalOrBMPString BER_CLASS_UNI BER_UNI_TAG_SET EncodedInformationTypes BER_CLASS_APP 5 G3FacsimileNonBasicParameters BER_CLASS_UNI BER_UNI_TAG_BITSTRING @@ -16,15 +22,21 @@ SecurityLabel BER_CLASS_UNI BER_UNI_TAG_SET #.END #.TYPE_ATTR +SecurityContext TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +EncodedInformationTypesConstraints TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 MessageSubmissionEnvelope TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 OtherMessageDeliveryFields TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +ExtendedContentType TYPE = FT_OID DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +ContentLength TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 MessageDeliveryIdentifier TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 MessageDeliveryTime TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 SupplementaryInformation TYPE = FT_STRING DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +RequestedDeliveryMethod TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 OriginatingMTACertificate TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 ProofOfSubmission TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 ExtendedCertificates TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 ORName TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +ORAddress TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 UniversalOrBMPString TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 EncodedInformationTypes TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 G3FacsimileNonBasicParameters TYPE = FT_BYTES DISPLAY = BASE_HEX STRINGS = NULL BITMASK = 0 diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf index 3b8da2e174..2f6367bfe0 100644 --- a/asn1/x411/x411.cnf +++ b/asn1/x411/x411.cnf @@ -14,20 +14,26 @@ AuthenticationFramework x509af #.INCLUDE ../x509af/x509af-exp.cnf #.EXPORTS +ContentLength EncodedInformationTypes +EncodedInformationTypesConstraints ExtendedCertificates +ExtendedContentType G3FacsimileNonBasicParameters +MessageDeliveryIdentifier MessageDeliveryTime +MessageSubmissionEnvelope +ORAddress ORName +OriginatingMTACertificate OtherMessageDeliveryFields +ProofOfSubmission +RequestedDeliveryMethod +SecurityContext +SecurityLabel SupplementaryInformation TeletexNonBasicParameters -SecurityLabel UniversalOrBMPString -MessageDeliveryIdentifier -ProofOfSubmission -OriginatingMTACertificate -MessageSubmissionEnvelope #.TYPE_RENAME MTABindArgument/authenticated AuthenticatedArgument @@ -193,6 +199,26 @@ UniversalOrganizationalUnitNames B "x411.extension-attribute.27" "universal-orga ReportDeliveryArgument B "2.6.1.4.14" "id-et-report" +# X402 - see master list in acp133.cnf + +ContentLength B "2.6.5.2.0" "id-at-mhs-maximum-content-length" +ExtendedContentType B "2.6.5.2.1" "id-at-mhs-deliverable-content-types" +ExtendedEncodedInformationType B "2.6.5.2.2" "id-at-mhs-exclusively-acceptable-eits" +ORName B "2.6.5.2.3" "id-at-mhs-dl-members" +ORAddress B "2.6.5.2.6" "id-at-mhs-or-addresses" +ExtendedContentType B "2.6.5.2.9" "id-at-mhs-supported-content-types" +ORName B "2.6.5.2.12" "id-at-mhs-dl-archive-service" +ORName B "2.6.5.2.15" "id-at-mhs-dl-subscription-service" +ExtendedEncodedInformationType B "2.6.5.2.17" "id-at-mhs-acceptable-eits" +ExtendedEncodedInformationType B "2.6.5.2.18" "id-at-mhs-unacceptable-eits" + + +# ACP133 - see master list in acp133.cnf +ORName B "2.16.840.1.101.2.1.5.47" "id-at-aLExemptedAddressProcessor" +ORAddress B "2.16.840.1.101.2.2.1.134.1" "id-at-collective-mhs-or-addresses" + + + #.FN_BODY AdditionalInformation /*XXX not implemented yet */ diff --git a/asn1/x509if/packet-x509if-template.c b/asn1/x509if/packet-x509if-template.c index d184bfb10e..d9469c3d24 100644 --- a/asn1/x509if/packet-x509if-template.c +++ b/asn1/x509if/packet-x509if-template.c @@ -142,6 +142,6 @@ void proto_register_x509if(void) { /*--- proto_reg_handoff_x509if -------------------------------------------*/ void proto_reg_handoff_x509if(void) { - +#include "packet-x509if-dis-tab.c" } diff --git a/asn1/x509if/x509if-exp.cnf b/asn1/x509if/x509if-exp.cnf index b68cedbd93..d1ba7c40ca 100644 --- a/asn1/x509if/x509if-exp.cnf +++ b/asn1/x509if/x509if-exp.cnf @@ -14,7 +14,6 @@ AttributeTypeAndDistinguishedValue BER_CLASS_UNI BER_UNI_TAG_SEQUENCE 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_ANY/*choice*/ -1/*choice*/ AttributeUsage BER_CLASS_UNI BER_UNI_TAG_ENUMERATED DITStructureRule BER_CLASS_UNI BER_UNI_TAG_SEQUENCE @@ -57,7 +56,6 @@ AttributeTypeAndDistinguishedValue TYPE = FT_NONE DISPLAY = BASE_NONE STRING SubtreeSpecification TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 LocalName TYPE = FT_UINT32 DISPLAY = BASE_DEC 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(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 diff --git a/asn1/x509if/x509if.cnf b/asn1/x509if/x509if.cnf index 2452c0cb28..f3726d9291 100644 --- a/asn1/x509if/x509if.cnf +++ b/asn1/x509if/x509if.cnf @@ -18,7 +18,7 @@ AttributeTypeAssertion AttributeUsage AttributeValue AttributeValueAssertion -BaseDistance +#BaseDistance ChopSpecification Context ContextAssertion @@ -97,7 +97,25 @@ DistinguishedName B "2.5.4.33" "id-at-roleOccupant" DistinguishedName B "2.5.4.34" "id-at-seeAlso" DistinguishedName B "2.5.4.49" "id-at-distinguishedName" - +# X402 - see master list in acp133.cnf +DistinguishedName B "2.6.5.2.5" "id-at-mhs-message-store-dn" +DistinguishedName B "2.6.5.2.14" "id-at-mhs-dl-related-lists" + +# ACP133 - see master list in acp133.cnf +DistinguishedName B "2.16.840.1.101.2.2.1.3" "id-at-alternateRecipient" +DistinguishedName B "2.16.840.1.101.2.2.1.4" "id-at-associatedOrganization" +DistinguishedName B "2.16.840.1.101.2.2.1.6" "id-at-associatedPLA" +DistinguishedName B "2.16.840.1.101.2.2.1.49" "id-at-aliasPointer" +DistinguishedName B "2.16.840.1.101.2.2.1.61" "id-at-listPointer" +DistinguishedName B "2.16.840.1.101.2.2.1.110" "id-at-administrator" +DistinguishedName B "2.16.840.1.101.2.2.1.111" "id-at-aigsExpanded" +DistinguishedName B "2.16.840.1.101.2.2.1.113" "id-at-associatedAL" +DistinguishedName B "2.16.840.1.101.2.2.1.114" "id-at-copyMember" +DistinguishedName B "2.16.840.1.101.2.2.1.117" "id-at-guard" +DistinguishedName B "2.16.840.1.101.2.2.1.121" "id-at-networkDN" +DistinguishedName B "2.16.840.1.101.2.2.1.138" "id-at-plasServed" +DistinguishedName B "2.16.840.1.101.2.2.1.139" "id-at-deployed" +DistinguishedName B "2.16.840.1.101.2.2.1.140" "id-at-garrison" #.FN_PARS ContextId FN_VARIANT = _str HF_INDEX = hf_x509if_object_identifier_id VAL_PTR = &object_identifier_id diff --git a/asn1/x509sat/packet-x509sat-template.c b/asn1/x509sat/packet-x509sat-template.c index 3e3c80bbef..96d8b427c2 100644 --- a/asn1/x509sat/packet-x509sat-template.c +++ b/asn1/x509sat/packet-x509sat-template.c @@ -78,6 +78,36 @@ void proto_register_x509sat(void) { /*--- proto_reg_handoff_x509sat -------------------------------------------*/ void proto_reg_handoff_x509sat(void) { #include "packet-x509sat-dis-tab.c" + + /* OBJECT CLASSES */ + + register_ber_oid_name("2.5.6.0", "top"); + register_ber_oid_name("2.5.6.1", "alias"); + register_ber_oid_name("2.5.6.2", "country"); + register_ber_oid_name("2.5.6.3", "locality"); + register_ber_oid_name("2.5.6.4", "organization"); + register_ber_oid_name("2.5.6.1", "organizationalUnit"); + register_ber_oid_name("2.5.6.6", "person"); + register_ber_oid_name("2.5.6.7", "organizationalPerson"); + register_ber_oid_name("2.5.6.8", "organizationalRole"); + register_ber_oid_name("2.5.6.9", "groupOfNames"); + register_ber_oid_name("2.5.6.10", "residentialPerson"); + register_ber_oid_name("2.5.6.11", "applicationProcess"); + register_ber_oid_name("2.5.6.12", "applicationEntity"); + register_ber_oid_name("2.5.6.13", "dSA"); + register_ber_oid_name("2.5.6.14", "device"); + register_ber_oid_name("2.5.6.15", "strongAuthenticationUser"); + register_ber_oid_name("2.5.6.16", "certificationAuthority"); + register_ber_oid_name("2.5.6.16.2", "certificationAuthorityV2"); + register_ber_oid_name("2.5.6.17", "groupOfUniqueNames"); + register_ber_oid_name("2.5.6.18", "userSecurityInformation"); + register_ber_oid_name("2.5.6.19", "cRLDistributionPoint"); + register_ber_oid_name("2.5.6.20", "dmd"); + register_ber_oid_name("2.5.6.21", "pkiUser"); + register_ber_oid_name("2.5.6.22", "pkiCA"); + + register_ber_oid_name("2.5.6.28", "parent"); + register_ber_oid_name("2.5.6.29", "child"); } diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf index 46344a2fc9..005c27e59e 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -164,6 +164,70 @@ DirectoryString B "2.5.4.65" "id-at-pseudonym" ObjectIdentifier B "2.5.4.66" "id-at-communuicationsService" ObjectIdentifier B "2.5.4.67" "id-at-communuicationsNetwork" +# X402 - see master list in acp133.cnf +ObjectIdentifier B "2.6.5.2.8" "id-at-mhs-supported-automatic-actions" +ObjectIdentifier B "2.6.5.2.10" "id-at-mhs-supported-attributes" +ObjectIdentifier B "2.6.5.2.11" "id-at-mhs-supported-matching-rules" + +# ACP133 - see master list in acp133.cnf + +DirectoryString B "2.16.840.1.101.2.2.1.45" "id-at-releaseAuthorityName" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.51" "id-at-cognizantAuthority" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.53" "id-at-accountingCode" +Boolean B "2.16.840.1.101.2.2.1.54" "id-at-dualRoute" +SyntaxGeneralizedTime B "2.16.840.1.101.2.2.1.55" "id-at-effectiveDate" +SyntaxGeneralizedTime B "2.16.840.1.101.2.2.1.57" "id-at-expirationDate" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.58" "id-at-hostOrgACP127" +SyntaxGeneralizedTime B "2.16.840.1.101.2.2.1.60" "id-at-lastRecapDate" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.62" "id-at-lmf" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.63" "id-at-longTitle" +Boolean B "2.16.840.1.101.2.2.1.64" "id-at-minimize" +Boolean B "2.16.840.1.101.2.2.1.65" "id-at-minimizeOverride" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.68" "id-at-nationality" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.68.1" "id-at-collectiveNationality" +Boolean B "2.16.840.1.101.2.2.1.69" "id-at-transferStation" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.70" "id-at-plaNameACP127" +Boolean B "2.16.840.1.101.2.2.1.72" "id-at-plaReplace" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.73" "id-at-primarySpellingACP127" +Boolean B "2.16.840.1.101.2.2.1.74" "id-at-publish" +SyntaxGeneralizedTime B "2.16.840.1.101.2.2.1.75" "id-at-recapDueDate" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.77" "id-at-rI" +Boolean B "2.16.840.1.101.2.2.1.81" "id-at-section" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.82" "id-at-serviceOrAgency" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.83" "id-at-sHD" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.84" "id-at-shortTitle" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.85" "id-at-sigad" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.86" "id-at-spot" +Boolean B "2.16.840.1.101.2.2.1.87" "id-at-tARE" +TelephoneNumber B "2.16.840.1.101.2.2.1.94" "id-at-aCPMobileTelephoneNumber" +TelephoneNumber B "2.16.840.1.101.2.2.1.95" "id-at-aCPPagerTelephoneNumber" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.96" "id-at-tCC" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.97" "id-at-tRC" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.106" "id-at-accessCodes" +SyntaxGraphicString B "2.16.840.1.101.2.2.1.107" "id-at-accessSchema" +TelephoneNumber B "2.16.840.1.101.2.2.1.109" "id-at-aCPTelephoneFaxNumber" +ObjectIdentifier B "2.16.840.1.101.2.2.1.115" "id-at-gatewayType" +ObjectIdentifier B "2.16.840.1.101.2.2.1.116" "id-at-ghpType" +DirectoryString B "2.16.840.1.101.2.2.1.118" "id-at-mailDomains" +TelephoneNumber B "2.16.840.1.101.2.2.1.119" "id-at-militaryFacsimileNumber" +TelephoneNumber B "2.16.840.1.101.2.2.1.119.1" "id-at-collectiveMilitaryFacsimileNumber" +TelephoneNumber B "2.16.840.1.101.2.2.1.120" "id-at-militaryTelephoneNumber" +TelephoneNumber B "2.16.840.1.101.2.2.1.120.1" "id-at-collectiveMilitaryTelephoneNumber" +SyntaxGraphicString B "2.16.840.1.101.2.2.1.122" "id-at-networkSchema" +DirectoryString B "2.16.840.1.101.2.2.1.124" "id-at-operationName" +DirectoryString B "2.16.840.1.101.2.2.1.125" "id-at-positionNumber" +DirectoryString B "2.16.840.1.101.2.2.1.126" "id-at-proprietaryMailboxes" +TelephoneNumber B "2.16.840.1.101.2.2.1.127" "id-at-secureFacsimileNumber" +TelephoneNumber B "2.16.840.1.101.2.2.1.127.1" "id-at-collectiveSecureFacsimileNumber" +TelephoneNumber B "2.16.840.1.101.2.2.1.128" "id-at-secureTelephoneNumber" +TelephoneNumber B "2.16.840.1.101.2.2.1.128.1" "id-at-collectiveSecureTelephoneNumber" +DirectoryString B "2.16.840.1.101.2.2.1.129" "id-at-serviceNumber" +DirectoryString B "2.16.840.1.101.2.2.1.133" "id-at-rank" +DirectoryString B "2.16.840.1.101.2.2.1.143" "id-at-adminConversion" +SyntaxPrintableString B "2.16.840.1.101.2.2.1.144" "id-at-tCCG" +DirectoryString B "2.16.840.1.101.2.2.1.145" "id-at-usdConversion" + + #.NO_EMIT #.TYPE_RENAME diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index df10c9247c..2b8f109143 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -66,6 +66,7 @@ DISSECTOR_SRC = \ packet-9p.c \ packet-aarp.c \ packet-acap.c \ + packet-acp133.c \ packet-acse.c \ packet-actrace.c \ packet-afp.c \ @@ -664,6 +665,7 @@ DISSECTOR_SRC = \ DISSECTOR_INCLUDES = \ $(PIDL_DISSECTOR_INCLUDES) \ format-oid.h \ + packet-acp133.h \ packet-acse.h \ packet-actrace.h \ packet-afp.h \ diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index 9a344f54cd..f6bfd5212a 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-x411.c */ +/* ./packet-x411.c */ /* ../../tools/asn2eth.py -X -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn */ /* Input file: packet-x411-template.c */ @@ -88,6 +88,8 @@ static int hf_x411_MTS_APDU_PDU = -1; /* MTS_APDU */ static int hf_x411_InternalTraceInformation_PDU = -1; /* InternalTraceInformation */ static int hf_x411_TraceInformation_PDU = -1; /* TraceInformation */ static int hf_x411_ReportDeliveryArgument_PDU = -1; /* ReportDeliveryArgument */ +static int hf_x411_ExtendedContentType_PDU = -1; /* ExtendedContentType */ +static int hf_x411_ContentLength_PDU = -1; /* ContentLength */ static int hf_x411_RecipientReassignmentProhibited_PDU = -1; /* RecipientReassignmentProhibited */ static int hf_x411_MTSOriginatorRequestedAlternateRecipient_PDU = -1; /* MTSOriginatorRequestedAlternateRecipient */ static int hf_x411_DLExpansionProhibited_PDU = -1; /* DLExpansionProhibited */ @@ -123,6 +125,8 @@ static int hf_x411_ReportingMTAName_PDU = -1; /* ReportingMTAName */ static int hf_x411_ExtendedCertificates_PDU = -1; /* ExtendedCertificates */ static int hf_x411_DLExemptedRecipients_PDU = -1; /* DLExemptedRecipients */ static int hf_x411_CertificateSelectors_PDU = -1; /* CertificateSelectors */ +static int hf_x411_ORName_PDU = -1; /* ORName */ +static int hf_x411_ORAddress_PDU = -1; /* ORAddress */ static int hf_x411_CommonName_PDU = -1; /* CommonName */ static int hf_x411_TeletexCommonName_PDU = -1; /* TeletexCommonName */ static int hf_x411_UniversalCommonName_PDU = -1; /* UniversalCommonName */ @@ -136,6 +140,7 @@ static int hf_x411_PDSName_PDU = -1; /* PDSName */ static int hf_x411_PhysicalDeliveryCountryName_PDU = -1; /* PhysicalDeliveryCountryName */ static int hf_x411_PostalCode_PDU = -1; /* PostalCode */ static int hf_x411_PhysicalDeliveryOfficeName_PDU = -1; /* PhysicalDeliveryOfficeName */ +static int hf_x411_ExtendedEncodedInformationType_PDU = -1; /* ExtendedEncodedInformationType */ static int hf_x411_unauthenticated = -1; /* NULL */ static int hf_x411_authenticated_argument = -1; /* AuthenticatedArgument */ static int hf_x411_authenticated_initiator_name = -1; /* MTAName */ @@ -748,7 +753,7 @@ static int dissect_empty_result(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_x411_MTAName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 347 "x411.cnf" +#line 373 "x411.cnf" tvbuff_t *mtaname = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, @@ -1021,7 +1026,7 @@ static int dissect_privacy_mark(packet_info *pinfo, proto_tree *tree, tvbuff_t * static int dissect_x411_OBJECT_IDENTIFIER(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 294 "x411.cnf" +#line 320 "x411.cnf" offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &object_identifier_id); @@ -1042,7 +1047,7 @@ static int dissect_category_type_impl(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_x411_CategoryValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 215 "x411.cnf" +#line 241 "x411.cnf" offset = dissect_unknown_ber(pinfo, tvb, offset, tree); @@ -1113,7 +1118,7 @@ static const ber_sequence_t SecurityContext_set_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_SET, BER_FLAGS_NOOWNTAG, dissect_SecurityContext_item }, }; -static int +int dissect_x411_SecurityContext(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, SecurityContext_set_of, hf_index, ett_x411_SecurityContext); @@ -1236,7 +1241,7 @@ static const value_string x411_MTABindError_vals[] = { static int dissect_x411_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 600 "x411.cnf" +#line 626 "x411.cnf" int error = -1; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, &error); @@ -1254,7 +1259,7 @@ dissect_x411_MTABindError(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, static int dissect_x411_NumericString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 436 "x411.cnf" +#line 462 "x411.cnf" tvbuff_t *nstring = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1292,7 +1297,7 @@ static int dissect_sub_address_impl(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_x411_PrintableString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 458 "x411.cnf" +#line 484 "x411.cnf" tvbuff_t *pstring = NULL; char *fmt = NULL; @@ -1375,7 +1380,7 @@ static const ber_choice_t CountryName_choice[] = { static int dissect_x411_CountryName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 226 "x411.cnf" +#line 252 "x411.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; @@ -1420,7 +1425,7 @@ static const ber_choice_t AdministrationDomainName_choice[] = { static int dissect_x411_AdministrationDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 248 "x411.cnf" +#line 274 "x411.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; @@ -1466,7 +1471,7 @@ static const ber_choice_t PrivateDomainIdentifier_choice[] = { static int dissect_x411_PrivateDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 398 "x411.cnf" +#line 424 "x411.cnf" if(doing_address) g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN); @@ -1497,7 +1502,7 @@ static const ber_sequence_t GlobalDomainIdentifier_sequence[] = { static int dissect_x411_GlobalDomainIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 505 "x411.cnf" +#line 531 "x411.cnf" oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; address_item = tree; @@ -1528,7 +1533,7 @@ static int dissect_attempted_domain(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_x411_LocalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 519 "x411.cnf" +#line 545 "x411.cnf" tvbuff_t *id = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_IA5String, @@ -1556,7 +1561,7 @@ static const ber_sequence_t MTSIdentifier_sequence[] = { static int dissect_x411_MTSIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 527 "x411.cnf" +#line 553 "x411.cnf" doing_address = TRUE; @@ -1587,7 +1592,7 @@ static int dissect_message_identifier(packet_info *pinfo, proto_tree *tree, tvbu static int dissect_x411_X121Address(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 367 "x411.cnf" +#line 393 "x411.cnf" tvbuff_t *string = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_NumericString, @@ -1622,7 +1627,7 @@ static int dissect_network_address_impl(packet_info *pinfo, proto_tree *tree, tv static int dissect_x411_TerminalIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 381 "x411.cnf" +#line 407 "x411.cnf" tvbuff_t *string = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1658,7 +1663,7 @@ static const ber_choice_t PrivateDomainName_choice[] = { static int dissect_x411_PrivateDomainName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 391 "x411.cnf" +#line 417 "x411.cnf" if(doing_address) g_strlcat(oraddress, "/P=", MAX_ORA_STR_LEN); @@ -1680,7 +1685,7 @@ static int dissect_private_domain_name_impl(packet_info *pinfo, proto_tree *tree static int dissect_x411_OrganizationName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 408 "x411.cnf" +#line 434 "x411.cnf" tvbuff_t *string = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -1781,7 +1786,7 @@ static const ber_sequence_t BuiltInStandardAttributes_sequence[] = { static int dissect_x411_BuiltInStandardAttributes(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 535 "x411.cnf" +#line 561 "x411.cnf" address_item = tree; @@ -1857,7 +1862,7 @@ static int dissect_extension_attribute_type_impl(packet_info *pinfo, proto_tree static int dissect_x411_T_extension_attribute_value(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 219 "x411.cnf" +#line 245 "x411.cnf" offset=call_x411_oid_callback("x411.extension-attribute", tvb, offset, pinfo, tree); @@ -1914,7 +1919,7 @@ static const ber_sequence_t ORName_sequence[] = { int dissect_x411_ORName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 492 "x411.cnf" +#line 518 "x411.cnf" oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; address_item = NULL; @@ -2047,7 +2052,7 @@ static int dissect_g3_facsimile_impl(packet_info *pinfo, proto_tree *tree, tvbuf static int dissect_x411_TeletexString(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 446 "x411.cnf" +#line 472 "x411.cnf" tvbuff_t *tstring = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_TeletexString, @@ -2201,7 +2206,7 @@ static const value_string x411_BuiltInContentType_vals[] = { static int dissect_x411_BuiltInContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 318 "x411.cnf" +#line 344 "x411.cnf" guint32 ict = -1; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -2233,9 +2238,9 @@ static int dissect_built_in_impl(packet_info *pinfo, proto_tree *tree, tvbuff_t -static int +int dissect_x411_ExtendedContentType(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 302 "x411.cnf" +#line 328 "x411.cnf" const char *name = NULL; offset = dissect_ber_object_identifier_str(implicit_tag, pinfo, tree, tvb, offset, hf_index, &content_type_id); @@ -2292,7 +2297,7 @@ static int dissect_ContentTypes_item(packet_info *pinfo, proto_tree *tree, tvbuf static int dissect_x411_ContentIdentifier(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 268 "x411.cnf" +#line 294 "x411.cnf" gint8 class; gboolean pc, ind_field; gint32 tag; @@ -2378,7 +2383,7 @@ static int dissect_per_message_indicators(packet_info *pinfo, proto_tree *tree, static int dissect_x411_Time(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 579 "x411.cnf" +#line 605 "x411.cnf" tvbuff_t *arrival = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_UTCTime, @@ -2514,7 +2519,7 @@ static const value_string x411_RoutingAction_vals[] = { static int dissect_x411_RoutingAction(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 590 "x411.cnf" +#line 616 "x411.cnf" int action = 0; offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, @@ -2590,7 +2595,7 @@ static const ber_sequence_t DomainSuppliedInformation_set[] = { static int dissect_x411_DomainSuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 558 "x411.cnf" +#line 584 "x411.cnf" doing_address = FALSE; @@ -2618,7 +2623,7 @@ static const ber_sequence_t TraceInformationElement_sequence[] = { static int dissect_x411_TraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 541 "x411.cnf" +#line 567 "x411.cnf" doing_address = TRUE; @@ -2701,7 +2706,7 @@ static int dissect_criticality_impl(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_x411_ExtensionValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 203 "x411.cnf" +#line 229 "x411.cnf" const char *name; if(extension_id != -1) @@ -2905,7 +2910,7 @@ static int dissect_message_envelope(packet_info *pinfo, proto_tree *tree, tvbuff static int dissect_x411_Content(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 335 "x411.cnf" +#line 361 "x411.cnf" tvbuff_t *next_tvb; /* we can do this now constructed octet strings are supported */ @@ -2957,7 +2962,7 @@ static int dissect_probe_identifier(packet_info *pinfo, proto_tree *tree, tvbuff -static int +int dissect_x411_ContentLength(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); @@ -3128,7 +3133,7 @@ static int dissect_subject_intermediate_trace_information(packet_info *pinfo, pr static int dissect_x411_AdditionalInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 197 "x411.cnf" +#line 223 "x411.cnf" /*XXX not implemented yet */ @@ -3583,7 +3588,7 @@ static const ber_sequence_t MTASuppliedInformation_set[] = { static int dissect_x411_MTASuppliedInformation(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 567 "x411.cnf" +#line 593 "x411.cnf" doing_address = FALSE; @@ -3612,7 +3617,7 @@ static const ber_sequence_t InternalTraceInformationElement_sequence[] = { static int dissect_x411_InternalTraceInformationElement(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 549 "x411.cnf" +#line 575 "x411.cnf" doing_address = TRUE; @@ -4138,7 +4143,7 @@ static const ber_sequence_t EncodedInformationTypesConstraints_sequence[] = { { 0, 0, 0, NULL } }; -static int +int dissect_x411_EncodedInformationTypesConstraints(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_sequence(implicit_tag, pinfo, tree, tvb, offset, EncodedInformationTypesConstraints_sequence, hf_index, ett_x411_EncodedInformationTypesConstraints); @@ -4717,7 +4722,7 @@ static int dissect_built_in_argument_impl(packet_info *pinfo, proto_tree *tree, static int dissect_x411_T_refused_extension(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 223 "x411.cnf" +#line 249 "x411.cnf" /*XXX not implemented yet */ @@ -5170,7 +5175,7 @@ static int dissect_standard_parameters_impl(packet_info *pinfo, proto_tree *tree static int dissect_x411_T_extensions_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 200 "x411.cnf" +#line 226 "x411.cnf" /*XXX not implemented yet */ @@ -5427,7 +5432,7 @@ static const ber_sequence_t RequestedDeliveryMethod_sequence_of[1] = { { BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_RequestedDeliveryMethod_item }, }; -static int +int dissect_x411_RequestedDeliveryMethod(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, RequestedDeliveryMethod_sequence_of, hf_index, ett_x411_RequestedDeliveryMethod); @@ -5534,9 +5539,9 @@ static const ber_sequence_t ORAddress_sequence[] = { { 0, 0, 0, NULL } }; -static int +int dissect_x411_ORAddress(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 479 "x411.cnf" +#line 505 "x411.cnf" oraddress = ep_alloc(MAX_ORA_STR_LEN); oraddress[0] = '\0'; doing_address = TRUE; @@ -6081,7 +6086,7 @@ dissect_x411_CertificateSelectors(gboolean implicit_tag _U_, tvbuff_t *tvb, int static int dissect_x411_CommonName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 421 "x411.cnf" +#line 447 "x411.cnf" tvbuff_t *string = NULL; offset = dissect_ber_restricted_string(implicit_tag, BER_UNI_TAG_PrintableString, @@ -6781,6 +6786,12 @@ static void dissect_TraceInformation_PDU(tvbuff_t *tvb, packet_info *pinfo, prot static void dissect_ReportDeliveryArgument_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissect_x411_ReportDeliveryArgument(FALSE, tvb, 0, pinfo, tree, hf_x411_ReportDeliveryArgument_PDU); } +static void dissect_ExtendedContentType_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_x411_ExtendedContentType(FALSE, tvb, 0, pinfo, tree, hf_x411_ExtendedContentType_PDU); +} +static void dissect_ContentLength_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_x411_ContentLength(FALSE, tvb, 0, pinfo, tree, hf_x411_ContentLength_PDU); +} static void dissect_RecipientReassignmentProhibited_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissect_x411_RecipientReassignmentProhibited(FALSE, tvb, 0, pinfo, tree, hf_x411_RecipientReassignmentProhibited_PDU); } @@ -6886,6 +6897,12 @@ static void dissect_DLExemptedRecipients_PDU(tvbuff_t *tvb, packet_info *pinfo, static void dissect_CertificateSelectors_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissect_x411_CertificateSelectors(FALSE, tvb, 0, pinfo, tree, hf_x411_CertificateSelectors_PDU); } +static void dissect_ORName_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_x411_ORName(TRUE, tvb, 0, pinfo, tree, hf_x411_ORName_PDU); +} +static void dissect_ORAddress_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_x411_ORAddress(FALSE, tvb, 0, pinfo, tree, hf_x411_ORAddress_PDU); +} static void dissect_CommonName_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissect_x411_CommonName(FALSE, tvb, 0, pinfo, tree, hf_x411_CommonName_PDU); } @@ -6925,6 +6942,9 @@ static void dissect_PostalCode_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree static void dissect_PhysicalDeliveryOfficeName_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { dissect_x411_PhysicalDeliveryOfficeName(FALSE, tvb, 0, pinfo, tree, hf_x411_PhysicalDeliveryOfficeName_PDU); } +static void dissect_ExtendedEncodedInformationType_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + dissect_x411_ExtendedEncodedInformationType(FALSE, tvb, 0, pinfo, tree, hf_x411_ExtendedEncodedInformationType_PDU); +} /*--- End of included file: packet-x411-fn.c ---*/ @@ -7086,6 +7106,14 @@ void proto_register_x411(void) { { "ReportDeliveryArgument", "x411.ReportDeliveryArgument", FT_NONE, BASE_NONE, NULL, 0, "ReportDeliveryArgument", HFILL }}, + { &hf_x411_ExtendedContentType_PDU, + { "ExtendedContentType", "x411.ExtendedContentType", + FT_OID, BASE_NONE, NULL, 0, + "ExtendedContentType", HFILL }}, + { &hf_x411_ContentLength_PDU, + { "ContentLength", "x411.ContentLength", + FT_UINT32, BASE_DEC, NULL, 0, + "ContentLength", HFILL }}, { &hf_x411_RecipientReassignmentProhibited_PDU, { "RecipientReassignmentProhibited", "x411.RecipientReassignmentProhibited", FT_UINT32, BASE_DEC, VALS(x411_RecipientReassignmentProhibited_vals), 0, @@ -7226,6 +7254,14 @@ void proto_register_x411(void) { { "CertificateSelectors", "x411.CertificateSelectors", FT_NONE, BASE_NONE, NULL, 0, "CertificateSelectors", HFILL }}, + { &hf_x411_ORName_PDU, + { "ORName", "x411.ORName", + FT_NONE, BASE_NONE, NULL, 0, + "ORName", HFILL }}, + { &hf_x411_ORAddress_PDU, + { "ORAddress", "x411.ORAddress", + FT_NONE, BASE_NONE, NULL, 0, + "ORAddress", HFILL }}, { &hf_x411_CommonName_PDU, { "CommonName", "x411.CommonName", FT_STRING, BASE_NONE, NULL, 0, @@ -7278,6 +7314,10 @@ void proto_register_x411(void) { { "PhysicalDeliveryOfficeName", "x411.PhysicalDeliveryOfficeName", FT_NONE, BASE_NONE, NULL, 0, "PhysicalDeliveryOfficeName", HFILL }}, + { &hf_x411_ExtendedEncodedInformationType_PDU, + { "ExtendedEncodedInformationType", "x411.ExtendedEncodedInformationType", + FT_OID, BASE_NONE, NULL, 0, + "ExtendedEncodedInformationType", HFILL }}, { &hf_x411_unauthenticated, { "unauthenticated", "x411.unauthenticated", FT_NONE, BASE_NONE, NULL, 0, @@ -9030,6 +9070,18 @@ void proto_reg_handoff_x411(void) { register_ber_oid_dissector("x411.extension-attribute.26", dissect_UniversalPersonalName_PDU, proto_x411, "universal-personal-name"); register_ber_oid_dissector("x411.extension-attribute.27", dissect_UniversalOrganizationalUnitNames_PDU, proto_x411, "universal-organizational-unit-names"); register_ber_oid_dissector("2.6.1.4.14", dissect_ReportDeliveryArgument_PDU, proto_x411, "id-et-report"); + register_ber_oid_dissector("2.6.5.2.0", dissect_ContentLength_PDU, proto_x411, "id-at-mhs-maximum-content-length"); + register_ber_oid_dissector("2.6.5.2.1", dissect_ExtendedContentType_PDU, proto_x411, "id-at-mhs-deliverable-content-types"); + register_ber_oid_dissector("2.6.5.2.2", dissect_ExtendedEncodedInformationType_PDU, proto_x411, "id-at-mhs-exclusively-acceptable-eits"); + register_ber_oid_dissector("2.6.5.2.3", dissect_ORName_PDU, proto_x411, "id-at-mhs-dl-members"); + register_ber_oid_dissector("2.6.5.2.6", dissect_ORAddress_PDU, proto_x411, "id-at-mhs-or-addresses"); + register_ber_oid_dissector("2.6.5.2.9", dissect_ExtendedContentType_PDU, proto_x411, "id-at-mhs-supported-content-types"); + register_ber_oid_dissector("2.6.5.2.12", dissect_ORName_PDU, proto_x411, "id-at-mhs-dl-archive-service"); + register_ber_oid_dissector("2.6.5.2.15", dissect_ORName_PDU, proto_x411, "id-at-mhs-dl-subscription-service"); + register_ber_oid_dissector("2.6.5.2.17", dissect_ExtendedEncodedInformationType_PDU, proto_x411, "id-at-mhs-acceptable-eits"); + register_ber_oid_dissector("2.6.5.2.18", dissect_ExtendedEncodedInformationType_PDU, proto_x411, "id-at-mhs-unacceptable-eits"); + register_ber_oid_dissector("2.16.840.1.101.2.1.5.47", dissect_ORName_PDU, proto_x411, "id-at-aLExemptedAddressProcessor"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.134.1", dissect_ORAddress_PDU, proto_x411, "id-at-collective-mhs-or-addresses"); /*--- End of included file: packet-x411-dis-tab.c ---*/ diff --git a/epan/dissectors/packet-x411.h b/epan/dissectors/packet-x411.h index 632a6358e4..8edf6cb948 100644 --- a/epan/dissectors/packet-x411.h +++ b/epan/dissectors/packet-x411.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-x411.h */ +/* ./packet-x411.h */ /* ../../tools/asn2eth.py -X -b -e -p x411 -c x411.cnf -s packet-x411-template x411.asn */ /* Input file: packet-x411-template.h */ @@ -38,15 +38,21 @@ int dissect_x411_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent /*--- Included file: packet-x411-exp.h ---*/ #line 1 "packet-x411-exp.h" +int dissect_x411_SecurityContext(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_x411_EncodedInformationTypesConstraints(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_MessageSubmissionEnvelope(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_OtherMessageDeliveryFields(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_x411_ExtendedContentType(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_x411_ContentLength(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_MessageDeliveryIdentifier(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_MessageDeliveryTime(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_SupplementaryInformation(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_x411_RequestedDeliveryMethod(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_OriginatingMTACertificate(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_ProofOfSubmission(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_ExtendedCertificates(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_ORName(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); +int dissect_x411_ORAddress(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_UniversalOrBMPString(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_EncodedInformationTypes(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x411_G3FacsimileNonBasicParameters(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c index 4a72e6e46c..98f3c90110 100644 --- a/epan/dissectors/packet-x509if.c +++ b/epan/dissectors/packet-x509if.c @@ -372,7 +372,7 @@ static int dissect_description(packet_info *pinfo, proto_tree *tree, tvbuff_t *t static int dissect_x509if_AttributeId(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 112 "x509if.cnf" +#line 130 "x509if.cnf" const char *fmt; const char *name; @@ -433,7 +433,7 @@ static int dissect_restrictionType(packet_info *pinfo, proto_tree *tree, tvbuff_ int dissect_x509if_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 142 "x509if.cnf" +#line 160 "x509if.cnf" int old_offset = offset; tvbuff_t *out_tvb; char *value = NULL; @@ -501,7 +501,7 @@ static int dissect_selectedValues_item(packet_info *pinfo, proto_tree *tree, tvb static int dissect_x509if_ValuesWithContextValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 189 "x509if.cnf" +#line 207 "x509if.cnf" offset=call_ber_oid_callback("unknown", tvb, offset, pinfo, tree); @@ -686,7 +686,7 @@ static int dissect_ca_contextType(packet_info *pinfo, proto_tree *tree, tvbuff_t static int dissect_x509if_ContextValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 106 "x509if.cnf" +#line 124 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -785,7 +785,7 @@ static const ber_sequence_t AttributeValueAssertion_sequence[] = { int dissect_x509if_AttributeValueAssertion(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 267 "x509if.cnf" +#line 285 "x509if.cnf" ava_hf_index = hf_index; last_ava = ep_alloc(MAX_AVA_STR_LEN); *last_ava = '\0'; @@ -887,7 +887,7 @@ dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag _U_, tvb static int dissect_x509if_RelativeDistinguishedName_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 220 "x509if.cnf" +#line 238 "x509if.cnf" if(!rdn_one_value) { top_of_rdn = tree; @@ -918,7 +918,7 @@ static const ber_sequence_t RelativeDistinguishedName_set_of[1] = { int dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 192 "x509if.cnf" +#line 210 "x509if.cnf" char *temp_dn; rdn_one_value = FALSE; @@ -957,7 +957,7 @@ dissect_x509if_RelativeDistinguishedName(gboolean implicit_tag _U_, tvbuff_t *tv static int dissect_x509if_RDNSequence_item(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 256 "x509if.cnf" +#line 274 "x509if.cnf" if(!dn_one_rdn) { /* this is the first element - record the top */ @@ -984,7 +984,7 @@ static const ber_sequence_t RDNSequence_sequence_of[1] = { int dissect_x509if_RDNSequence(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 235 "x509if.cnf" +#line 253 "x509if.cnf" const char *fmt; dn_one_rdn = FALSE; /* reset */ @@ -1105,7 +1105,7 @@ static int dissect_specificExclusions(packet_info *pinfo, proto_tree *tree, tvbu -int +static int dissect_x509if_BaseDistance(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { offset = dissect_ber_integer(implicit_tag, pinfo, tree, tvb, offset, hf_index, NULL); @@ -1506,7 +1506,7 @@ static int dissect_level(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, in static int dissect_x509if_SelectedValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 180 "x509if.cnf" +#line 198 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -1549,7 +1549,7 @@ static int dissect_entryType(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb static int dissect_x509if_DefaultValueValues(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index _U_) { -#line 186 "x509if.cnf" +#line 204 "x509if.cnf" offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); @@ -2951,5 +2951,33 @@ void proto_register_x509if(void) { /*--- proto_reg_handoff_x509if -------------------------------------------*/ void proto_reg_handoff_x509if(void) { +/*--- Included file: packet-x509if-dis-tab.c ---*/ +#line 1 "packet-x509if-dis-tab.c" + register_ber_oid_dissector("2.5.4.1", dissect_DistinguishedName_PDU, proto_x509if, "id-at-aliasedEntryName"); + register_ber_oid_dissector("2.5.4.31", dissect_DistinguishedName_PDU, proto_x509if, "id-at-member"); + register_ber_oid_dissector("2.5.4.32", dissect_DistinguishedName_PDU, proto_x509if, "id-at-owner"); + register_ber_oid_dissector("2.5.4.33", dissect_DistinguishedName_PDU, proto_x509if, "id-at-roleOccupant"); + register_ber_oid_dissector("2.5.4.34", dissect_DistinguishedName_PDU, proto_x509if, "id-at-seeAlso"); + register_ber_oid_dissector("2.5.4.49", dissect_DistinguishedName_PDU, proto_x509if, "id-at-distinguishedName"); + register_ber_oid_dissector("2.6.5.2.5", dissect_DistinguishedName_PDU, proto_x509if, "id-at-mhs-message-store-dn"); + register_ber_oid_dissector("2.6.5.2.14", dissect_DistinguishedName_PDU, proto_x509if, "id-at-mhs-dl-related-lists"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.3", dissect_DistinguishedName_PDU, proto_x509if, "id-at-alternateRecipient"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.4", dissect_DistinguishedName_PDU, proto_x509if, "id-at-associatedOrganization"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.6", dissect_DistinguishedName_PDU, proto_x509if, "id-at-associatedPLA"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.49", dissect_DistinguishedName_PDU, proto_x509if, "id-at-aliasPointer"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.61", dissect_DistinguishedName_PDU, proto_x509if, "id-at-listPointer"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.110", dissect_DistinguishedName_PDU, proto_x509if, "id-at-administrator"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.111", dissect_DistinguishedName_PDU, proto_x509if, "id-at-aigsExpanded"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.113", dissect_DistinguishedName_PDU, proto_x509if, "id-at-associatedAL"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.114", dissect_DistinguishedName_PDU, proto_x509if, "id-at-copyMember"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.117", dissect_DistinguishedName_PDU, proto_x509if, "id-at-guard"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.121", dissect_DistinguishedName_PDU, proto_x509if, "id-at-networkDN"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.138", dissect_DistinguishedName_PDU, proto_x509if, "id-at-plasServed"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.139", dissect_DistinguishedName_PDU, proto_x509if, "id-at-deployed"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.140", dissect_DistinguishedName_PDU, proto_x509if, "id-at-garrison"); + + +/*--- End of included file: packet-x509if-dis-tab.c ---*/ +#line 146 "packet-x509if-template.c" } diff --git a/epan/dissectors/packet-x509if.h b/epan/dissectors/packet-x509if.h index d5e7320a8f..898b1bbbad 100644 --- a/epan/dissectors/packet-x509if.h +++ b/epan/dissectors/packet-x509if.h @@ -59,7 +59,6 @@ int dissect_x509if_AttributeTypeAndDistinguishedValue(gboolean implicit_tag, tvb int dissect_x509if_SubtreeSpecification(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x509if_LocalName(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x509if_ChopSpecification(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); -int dissect_x509if_BaseDistance(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x509if_Refinement(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x509if_AttributeUsage(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); int dissect_x509if_DITStructureRule(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hf_index); diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c index f82af0a62b..adc41eada9 100644 --- a/epan/dissectors/packet-x509sat.c +++ b/epan/dissectors/packet-x509sat.c @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-x509sat.c */ +/* ./packet-x509sat.c */ /* ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ /* Input file: packet-x509sat-template.c */ @@ -2831,10 +2831,98 @@ void proto_reg_handoff_x509sat(void) { register_ber_oid_dissector("2.5.4.65", dissect_DirectoryString_PDU, proto_x509sat, "id-at-pseudonym"); register_ber_oid_dissector("2.5.4.66", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-communuicationsService"); register_ber_oid_dissector("2.5.4.67", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-communuicationsNetwork"); + register_ber_oid_dissector("2.6.5.2.8", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-mhs-supported-automatic-actions"); + register_ber_oid_dissector("2.6.5.2.10", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-mhs-supported-attributes"); + register_ber_oid_dissector("2.6.5.2.11", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-mhs-supported-matching-rules"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.45", dissect_DirectoryString_PDU, proto_x509sat, "id-at-releaseAuthorityName"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.51", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-cognizantAuthority"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.53", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-accountingCode"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.54", dissect_Boolean_PDU, proto_x509sat, "id-at-dualRoute"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.55", dissect_SyntaxGeneralizedTime_PDU, proto_x509sat, "id-at-effectiveDate"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.57", dissect_SyntaxGeneralizedTime_PDU, proto_x509sat, "id-at-expirationDate"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.58", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-hostOrgACP127"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.60", dissect_SyntaxGeneralizedTime_PDU, proto_x509sat, "id-at-lastRecapDate"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.62", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-lmf"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.63", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-longTitle"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.64", dissect_Boolean_PDU, proto_x509sat, "id-at-minimize"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.65", dissect_Boolean_PDU, proto_x509sat, "id-at-minimizeOverride"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.68", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-nationality"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.68.1", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-collectiveNationality"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.69", dissect_Boolean_PDU, proto_x509sat, "id-at-transferStation"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.70", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-plaNameACP127"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.72", dissect_Boolean_PDU, proto_x509sat, "id-at-plaReplace"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.73", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-primarySpellingACP127"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.74", dissect_Boolean_PDU, proto_x509sat, "id-at-publish"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.75", dissect_SyntaxGeneralizedTime_PDU, proto_x509sat, "id-at-recapDueDate"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.77", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-rI"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.81", dissect_Boolean_PDU, proto_x509sat, "id-at-section"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.82", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-serviceOrAgency"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.83", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-sHD"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.84", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-shortTitle"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.85", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-sigad"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.86", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-spot"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.87", dissect_Boolean_PDU, proto_x509sat, "id-at-tARE"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.94", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-aCPMobileTelephoneNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.95", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-aCPPagerTelephoneNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.96", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-tCC"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.97", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-tRC"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.106", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-accessCodes"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.107", dissect_SyntaxGraphicString_PDU, proto_x509sat, "id-at-accessSchema"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.109", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-aCPTelephoneFaxNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.115", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-gatewayType"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.116", dissect_ObjectIdentifier_PDU, proto_x509sat, "id-at-ghpType"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.118", dissect_DirectoryString_PDU, proto_x509sat, "id-at-mailDomains"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.119", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-militaryFacsimileNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.119.1", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-collectiveMilitaryFacsimileNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.120", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-militaryTelephoneNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.120.1", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-collectiveMilitaryTelephoneNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.122", dissect_SyntaxGraphicString_PDU, proto_x509sat, "id-at-networkSchema"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.124", dissect_DirectoryString_PDU, proto_x509sat, "id-at-operationName"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.125", dissect_DirectoryString_PDU, proto_x509sat, "id-at-positionNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.126", dissect_DirectoryString_PDU, proto_x509sat, "id-at-proprietaryMailboxes"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.127", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-secureFacsimileNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.127.1", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-collectiveSecureFacsimileNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.128", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-secureTelephoneNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.128.1", dissect_TelephoneNumber_PDU, proto_x509sat, "id-at-collectiveSecureTelephoneNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.129", dissect_DirectoryString_PDU, proto_x509sat, "id-at-serviceNumber"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.133", dissect_DirectoryString_PDU, proto_x509sat, "id-at-rank"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.143", dissect_DirectoryString_PDU, proto_x509sat, "id-at-adminConversion"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.144", dissect_SyntaxPrintableString_PDU, proto_x509sat, "id-at-tCCG"); + register_ber_oid_dissector("2.16.840.1.101.2.2.1.145", dissect_DirectoryString_PDU, proto_x509sat, "id-at-usdConversion"); /*--- End of included file: packet-x509sat-dis-tab.c ---*/ #line 81 "packet-x509sat-template.c" + + /* OBJECT CLASSES */ + + register_ber_oid_name("2.5.6.0", "top"); + register_ber_oid_name("2.5.6.1", "alias"); + register_ber_oid_name("2.5.6.2", "country"); + register_ber_oid_name("2.5.6.3", "locality"); + register_ber_oid_name("2.5.6.4", "organization"); + register_ber_oid_name("2.5.6.1", "organizationalUnit"); + register_ber_oid_name("2.5.6.6", "person"); + register_ber_oid_name("2.5.6.7", "organizationalPerson"); + register_ber_oid_name("2.5.6.8", "organizationalRole"); + register_ber_oid_name("2.5.6.9", "groupOfNames"); + register_ber_oid_name("2.5.6.10", "residentialPerson"); + register_ber_oid_name("2.5.6.11", "applicationProcess"); + register_ber_oid_name("2.5.6.12", "applicationEntity"); + register_ber_oid_name("2.5.6.13", "dSA"); + register_ber_oid_name("2.5.6.14", "device"); + register_ber_oid_name("2.5.6.15", "strongAuthenticationUser"); + register_ber_oid_name("2.5.6.16", "certificationAuthority"); + register_ber_oid_name("2.5.6.16.2", "certificationAuthorityV2"); + register_ber_oid_name("2.5.6.17", "groupOfUniqueNames"); + register_ber_oid_name("2.5.6.18", "userSecurityInformation"); + register_ber_oid_name("2.5.6.19", "cRLDistributionPoint"); + register_ber_oid_name("2.5.6.20", "dmd"); + register_ber_oid_name("2.5.6.21", "pkiUser"); + register_ber_oid_name("2.5.6.22", "pkiCA"); + + register_ber_oid_name("2.5.6.28", "parent"); + register_ber_oid_name("2.5.6.29", "child"); } diff --git a/epan/dissectors/packet-x509sat.h b/epan/dissectors/packet-x509sat.h index 63811c08b9..3590d2cd42 100644 --- a/epan/dissectors/packet-x509sat.h +++ b/epan/dissectors/packet-x509sat.h @@ -1,6 +1,6 @@ /* Do not modify this file. */ /* It is created automatically by the ASN.1 to Ethereal dissector compiler */ -/* .\packet-x509sat.h */ +/* ./packet-x509sat.h */ /* ../../tools/asn2eth.py -X -b -e -p x509sat -c x509sat.cnf -s packet-x509sat-template SelectedAttributeTypes.asn */ /* Input file: packet-x509sat-template.h */ |