aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorgal <gal@f5534014-38df-0310-8fa8-9805f1628bb7>2006-03-05 11:28:13 +0000
committergal <gal@f5534014-38df-0310-8fa8-9805f1628bb7>2006-03-05 11:28:13 +0000
commitfdb93faeb4c44867a7342c7a51fb2ee9aafbe866 (patch)
tree13f4e048c325a545eb8a27056dbcc0d0d312918f /asn1
parentc42725d2ae01e61c3d71c14b9088e55fb84b4d9e (diff)
ACP133 attribute syntaxes and attribute definitions used by the DAP, DSP and DISP dissectors. Also includes X.402 definitions and OID registrations for object classes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17471 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
-rw-r--r--asn1/acp133/Makefile17
-rw-r--r--asn1/acp133/acp133.asn185
-rw-r--r--asn1/acp133/acp133.cnf164
-rw-r--r--asn1/acp133/packet-acp133-template.c146
-rw-r--r--asn1/acp133/packet-acp133-template.h31
-rw-r--r--asn1/dop/dop.asn8
-rw-r--r--asn1/x411/x411-exp.cnf12
-rw-r--r--asn1/x411/x411.cnf36
-rw-r--r--asn1/x509if/packet-x509if-template.c2
-rw-r--r--asn1/x509if/x509if-exp.cnf2
-rw-r--r--asn1/x509if/x509if.cnf22
-rw-r--r--asn1/x509sat/packet-x509sat-template.c30
-rw-r--r--asn1/x509sat/x509sat.cnf64
13 files changed, 705 insertions, 14 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 11:41:41 +0000