diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2012-11-12 13:45:24 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2012-11-12 13:45:24 +0000 |
commit | d7286991156b836424f6643113f33434a41fc16b (patch) | |
tree | db21f93be1f0025a0bbb8997dbc6fd8bd238b24f /asn1/acp133 | |
parent | 777b1274dfc3cd26c4f47e2f6c2f14cc0442837f (diff) |
Update ACP133 to edition D.
svn path=/trunk/; revision=46008
Diffstat (limited to 'asn1/acp133')
-rw-r--r-- | asn1/acp133/Makefile.common | 6 | ||||
-rw-r--r-- | asn1/acp133/acp133.asn | 46 | ||||
-rw-r--r-- | asn1/acp133/acp133.cnf | 40 | ||||
-rw-r--r-- | asn1/acp133/packet-acp133-template.c | 39 |
4 files changed, 117 insertions, 14 deletions
diff --git a/asn1/acp133/Makefile.common b/asn1/acp133/Makefile.common index 5643ddaa10..f8c0fe8c52 100644 --- a/asn1/acp133/Makefile.common +++ b/asn1/acp133/Makefile.common @@ -45,7 +45,8 @@ EXTRA_CNF= \ $(builddir)/../p1/p1-exp.cnf \ $(builddir)/../x509af/x509af-exp.cnf \ $(builddir)/../x509ce/x509ce-exp.cnf \ - $(builddir)/../x509if/x509if-exp.cnf + $(builddir)/../x509if/x509if-exp.cnf \ + $(builddir)/../x509sat/x509sat-exp.cnf $(builddir)/../p1/p1-exp.cnf: (cd $(builddir)/../p1 && $(MAKE_CNF_EXPORT)) @@ -59,3 +60,6 @@ $(builddir)/../x509ce/x509ce-exp.cnf: $(builddir)/../x509if/x509if-exp.cnf: (cd $(builddir)/../x509if && $(MAKE_CNF_EXPORT)) +$(builddir)/../x509sat/x509sat-exp.cnf: + (cd $(builddir)/../x509sat && $(MAKE_CNF_EXPORT)) + diff --git a/asn1/acp133/acp133.asn b/asn1/acp133/acp133.asn index 2a00400a07..8c752357e9 100644 --- a/asn1/acp133/acp133.asn +++ b/asn1/acp133/acp133.asn @@ -14,6 +14,10 @@ IMPORTS --== FROM MTSAbstractService {joint-iso-itu-t mhs(6) mts(3) modules(0) mts-abstract-service(1) version-1999(1)} + DirectoryString + --== + FROM SelectedAttributeTypes {joint-iso-itu-t ds(5) module(1) + selectedAttributeTypes(5) 4} Name --== FROM InformationFramework {joint-iso-itu-t ds(5) module(1) @@ -31,7 +35,7 @@ OnSupported ::= BIT STRING { acp127-nn(0), acp127-pn(1), acp127-tn(2) } ACPLegacyFormat ::= INTEGER { janap128(0), - acp126(1), + acp127(1), -- changed from acp126 for consistency purposes doi103(2), doi103-special(3), acp127(4), @@ -45,11 +49,20 @@ ACPLegacyFormat ::= INTEGER { 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. + socomm-external(15), + mfi-default(16), + acp-legacy-format-smtp(17), + p22(18), + -- 19 - 31 for national or bilateral use + acp145-united-states(32), + acp145-australia(33), + acp145-canada(34), + acp145-united-kingdom(35), + acp145-new-zealand(36) } + +ACPNoAttachments ::= BOOLEAN +Active ::= BOOLEAN Addressees ::= SEQUENCE OF PrintableString (SIZE (1..55)) @@ -58,17 +71,36 @@ confidential(3), secret(4), top-secret(5) } DistributionCode ::= PrintableString +EmConCapability ::= BOOLEAN + +EmConState ::= ENUMERATED { enabled(0), receive-only(1), electronic-silence(2), disabled(3) } + JPEG ::= OCTET STRING -- a JPEG image +MaxMessageSize ::= INTEGER + MonthlyUKMs ::= --SIGNED { SEQUENCE OF UKMEntry }-- SEQUENCE { ukm-entries SEQUENCE OF UKMEntry, algorithm-identifier AlgorithmIdentifier, encrypted BIT STRING } +MsgProtocolInfoCapability ::= ENUMERATED { acp-127(0), acp-123(1) } + Remarks ::= SEQUENCE OF PrintableString -RIParameters ::= SET { +-- RIParameters used to be defined as a ASN.1 SET specification, but +-- this has been deprecated in edition D in favour of a DirectoryString +-- containing a sequence of dollar separated PrintableStrings. +-- +-- Implemented in Wireshark as a CHOICE to be able to decode both without +-- using a preference. +RIParameters ::= CHOICE { + ri-parameters DirectoryString, + ri-parameters-deprecated RIParametersDeprecated +} + +RIParametersDeprecated ::= SET { rI [0] PrintableString, rIType [1] ENUMERATED { normal(0), off-line(1), partTimeTerminal(2) }, @@ -82,6 +114,8 @@ UKMEntry ::= SEQUENCE { ukm OCTET STRING } +WebAccessCapability ::= BOOLEAN + -- these are imported directly from SDN.701 PairwiseTag ::= SEQUENCE { diff --git a/asn1/acp133/acp133.cnf b/asn1/acp133/acp133.cnf index c3cc08c5a9..484560f0d5 100644 --- a/asn1/acp133/acp133.cnf +++ b/asn1/acp133/acp133.cnf @@ -1,13 +1,11 @@ # acp133.cnf # ACP133 conformation file +#.IMPORT ../p1/p1-exp.cnf +#.IMPORT ../x509af/x509af-exp.cnf #.IMPORT ../x509ce/x509ce-exp.cnf #.IMPORT ../x509if/x509if-exp.cnf -#.IMPORT ../x509af/x509af-exp.cnf -#.IMPORT ../p1/p1-exp.cnf - -#.MODULE_IMPORT -MTSAbstractService p1 +#.IMPORT ../x509sat/x509sat-exp.cnf #.PDU ACPPreferredDelivery @@ -203,4 +201,36 @@ ACPLegacyFormat B "2.16.840.1.101.2.2.1.142" "id-at-aCPLegacyFormat" 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" +# DirectoryString B "2.16.840.1.101.2.2.1.158" "id-at-aCPRoleInformation" - see x509sat.cnf +# DirectoryString B "2.16.840.1.101.2.2.1.159" "id-at-coalitionGrade" - see x509sat.cnf +# TelephoneNumber B "2.16.840.1.101.2.2.1.160" "id-at-militaryIPPhoneNumber" - see x509sat.cnf +# ObjectIdentifier B "2.16.840.1.101.2.2.1.161" "id-at-fileTypeInfoCapability" - see x509sat.cnf +MaxMessageSize B "2.16.840.1.101.2.2.1.162" "id-at-maxMessageSize" +MsgProtocolInfoCapability B "2.16.840.1.101.2.2.1.163" "id-at-msgProtocolInfoCapability" +Active B "2.16.840.1.101.2.2.1.164" "id-at-active" +EmConCapability B "2.16.840.1.101.2.2.1.165" "id-at-emConCapability" +EmConState B "2.16.840.1.101.2.2.1.166" "id-at-emConState" +WebAccessCapability B "2.16.840.1.101.2.2.1.167" "id-at-webAccessCapability" +DistributionCode B "2.16.840.1.101.2.2.1.168" "id-at-distributionExemptAction" +DistributionCode B "2.16.840.1.101.2.2.1.169" "id-at-distributionExemptInfo" +DistributionCode B "2.16.840.1.101.2.2.1.170" "id-at-distributionKeywordAction" +DistributionCode B "2.16.840.1.101.2.2.1.171" "id-at-distributionKeywordInfo" +# PrintableString B "2.16.840.1.101.2.2.1.172" "id-at-aCPFunctionalDescription" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.173" "id-at-alternatePLAName" - see x509sat.cnf +# GeneralizedTime B "2.16.840.1.101.2.2.1.174" "id-at-aCPEntryCreationDate" - see x509sat.cnf +# GeneralizedTime B "2.16.840.1.101.2.2.1.175" "id-at-aCPEntryModificationDate" - see x509sat.cnf +# ObjectIdentifier B "2.16.840.1.101.2.2.1.176" "id-at-aCPEntryType" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.177" "id-at-aCPEntryEniqueId" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.178" "id-at-aCPCitizenship" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.179" "id-at-aCPEID" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.180" "id-at-aCPCOI" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.181" "id-at-aCPPublishTo" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.182" "id-at-aCPSvcApps" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.183" "id-at-aCPDirectoinsTo" - see x509sat.cnf +# DistinguishedName B "2.16.840.1.101.2.2.1.184" "id-at-aCPDutyOfficer" - see x509if.cnf +# PrintableString B "2.16.840.1.101.2.2.1.185" "id-at-aCPLatitude" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.186" "id-at-aCPLocationMap" - see x509sat.cnf +# PrintableString B "2.16.840.1.101.2.2.1.187" "id-at-aCPLongitude" - see x509sat.cnf +# DistinguishedName B "2.16.840.1.101.2.2.1.188" "id-at-primaryMember" - see x509sat.cnf +ACPNoAttachments B "2.16.840.1.101.2.2.1.189" "id-at-aCPNoAttachments" diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c index 7306943631..18ca3e5a12 100644 --- a/asn1/acp133/packet-acp133-template.c +++ b/asn1/acp133/packet-acp133-template.c @@ -32,10 +32,11 @@ #include "packet-ber.h" +#include "packet-p1.h" #include "packet-x509af.h" -#include "packet-x509if.h" #include "packet-x509ce.h" -#include "packet-p1.h" +#include "packet-x509if.h" +#include "packet-x509sat.h" #include "packet-acp133.h" @@ -127,6 +128,40 @@ void proto_reg_handoff_acp133(void) { oid_add_from_string("id-oc-dSSCSPLA","2.16.840.1.101.2.2.3.67"); oid_add_from_string("id-oc-aCPNetworkEdB","2.16.840.1.101.2.2.3.68"); oid_add_from_string("id-oc-aCPNetworkInstructionsEdB","2.16.840.1.101.2.2.3.69"); + oid_add_from_string("id-oc-aCPAddressList","2.16.840.1.101.2.2.3.70"); + oid_add_from_string("id-oc-aCPAliasCommonName","2.16.840.1.101.2.2.3.71"); + oid_add_from_string("id-oc-aCPAliasOrganizationalUnit","2.16.840.1.101.2.2.3.72"); + oid_add_from_string("id-oc-aCPDevice","2.16.840.1.101.2.2.3.73"); + oid_add_from_string("id-oc-aCPDistributionCodeDescription","2.16.840.1.101.2.2.3.74"); + oid_add_from_string("id-oc-aCPGroupOfNames","2.16.840.1.101.2.2.3.75"); + oid_add_from_string("id-oc-aCPLocality","2.16.840.1.101.2.2.3.76"); + oid_add_from_string("id-oc-aCPOrganization","2.16.840.1.101.2.2.3.77"); + oid_add_from_string("id-oc-aCPOrganizationalPerson","2.16.840.1.101.2.2.3.78"); + oid_add_from_string("id-oc-aCPOrganizationalRole","2.16.840.1.101.2.2.3.79"); + oid_add_from_string("id-oc-aCPOrganizationalUnit","2.16.840.1.101.2.2.3.80"); + oid_add_from_string("id-oc-aCPDistributionCodesHandled","2.16.840.1.101.2.2.3.81"); + oid_add_from_string("id-oc-aCPMhsCapabilitiesInformation","2.16.840.1.101.2.2.3.82"); + oid_add_from_string("id-oc-aCPOtherContactInformation","2.16.840.1.101.2.2.3.83"); + oid_add_from_string("id-oc-aCPPlaUser","2.16.840.1.101.2.2.3.84"); + oid_add_from_string("id-oc-aCPCRLDistributionPoint","2.16.840.1.101.2.2.3.85"); + oid_add_from_string("id-oc-aCPSecurePKIUser","2.16.840.1.101.2.2.3.86"); + oid_add_from_string("id-oc-aCPAltSpellingACP127","2.16.840.1.101.2.2.3.87"); + oid_add_from_string("id-oc-aCPCadACP127","2.16.840.1.101.2.2.3.88"); + oid_add_from_string("id-oc-aCPDSSCSPLA","2.16.840.1.101.2.2.3.89"); + oid_add_from_string("id-oc-aCPOrgACP127","2.16.840.1.101.2.2.3.90"); + oid_add_from_string("id-oc-aCPPLACollectiveACP127","2.16.840.1.101.2.2.3.91"); + oid_add_from_string("id-oc-aCPRoutingIndicator","2.16.840.1.101.2.2.3.92"); + oid_add_from_string("id-oc-aCPSigIntPLA","2.16.840.1.101.2.2.3.93"); + oid_add_from_string("id-oc-aCPSIPLA","2.16.840.1.101.2.2.3.94"); + oid_add_from_string("id-oc-aCPSpotPLA","2.16.840.1.101.2.2.3.95"); + oid_add_from_string("id-oc-aCPTaskForceACP127","2.16.840.1.101.2.2.3.96"); + oid_add_from_string("id-oc-aCPTenantACP127","2.16.840.1.101.2.2.3.97"); + oid_add_from_string("id-oc-aCPPlaACP127","2.16.840.1.101.2.2.3.98"); + oid_add_from_string("id-oc-aCPPlaData","2.16.840.1.101.2.2.3.99"); + oid_add_from_string("id-oc-aCPEntryAdmin","2.16.840.1.101.2.2.3.102"); + oid_add_from_string("id-oc-aCPOrganizationalLocation","2.16.840.1.101.2.2.3.103"); + oid_add_from_string("id-oc-aCPEntryCharacteristics","2.16.840.1.101.2.2.3.104"); + oid_add_from_string("id-oc-aCPPrivilege","2.16.840.1.101.2.2.3.105"); /* gateway types */ oid_add_from_string("acp120-acp127","2.16.840.1.101.2.2.5.0"); |