From e0937a59921ad7332d0751b7f4b1dc7e75aa8ac3 Mon Sep 17 00:00:00 2001 From: Anders Broman Date: Tue, 6 Nov 2007 20:26:13 +0000 Subject: as2wrs now handles EXTERNAL(direct-reference requires no special handling). svn path=/trunk/; revision=23384 --- asn1/dop/Makefile.common | 4 ---- asn1/dop/dop.asn | 6 ++---- asn1/dop/dop.cnf | 19 +++++++++---------- 3 files changed, 11 insertions(+), 18 deletions(-) (limited to 'asn1/dop') diff --git a/asn1/dop/Makefile.common b/asn1/dop/Makefile.common index 7a9608edc8..d4c086a9a4 100644 --- a/asn1/dop/Makefile.common +++ b/asn1/dop/Makefile.common @@ -49,7 +49,6 @@ SRC_FILES = \ A2W_FLAGS= -b -X -T -e EXTRA_CNF= \ - ../acse/acse-exp.cnf \ ../dap/dap-exp.cnf \ ../dsp/dsp-exp.cnf \ ../pkixcrmf/crmf-exp.cnf \ @@ -57,9 +56,6 @@ EXTRA_CNF= \ ../x509if/x509if-exp.cnf \ ../x509sat/x509sat-exp.cnf -../acse/acse-exp.cnf: - (cd ../acse && $(MAKE_CNF_EXPORT)) - ../dap/dap-exp.cnf: (cd ../dap && $(MAKE_CNF_EXPORT)) diff --git a/asn1/dop/dop.asn b/asn1/dop/dop.asn index 99de44df12..a8fb62d381 100644 --- a/asn1/dop/dop.asn +++ b/asn1/dop/dop.asn @@ -44,9 +44,7 @@ IMPORTS basicAccessControl(24) 4} Filter FROM DirectoryAbstractService {joint-iso-itu-t ds(5) module(1) - directoryAbstractService(2) 4} - EXTERNALt - FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) acse1(1) version1(1)}; + directoryAbstractService(2) 4}; -- data types DSEType ::= BIT STRING { @@ -792,7 +790,7 @@ AuthenticationLevel ::= CHOICE { SEQUENCE {level ENUMERATED {none(0), simple(1), strong(2)}, localQualifier INTEGER OPTIONAL, signed BOOLEAN DEFAULT FALSE}, - other EXTERNALt + other EXTERNAL } GrantsAndDenials ::= BIT STRING { diff --git a/asn1/dop/dop.cnf b/asn1/dop/dop.cnf index 9a519aa542..00ffc726b5 100644 --- a/asn1/dop/dop.cnf +++ b/asn1/dop/dop.cnf @@ -4,7 +4,6 @@ #.IMPORT ../dsp/dsp-exp.cnf #.IMPORT ../dap/dap-exp.cnf #.IMPORT ../pkixcrmf/crmf-exp.cnf -#.IMPORT ../acse/acse-exp.cnf #.MODULE_IMPORT BasicAccessControl crmf @@ -66,22 +65,22 @@ TerminateOperationalBindingResultData/terminateAt terminateAtGeneralizedTime #.REGISTER -DSEType B "2.5.12.0" "id-doa-dseType" +DSEType B "2.5.12.0" "id-doa-dseType" SupplierInformation B "2.5.12.5" "id-doa-supplierKnowledge" ConsumerInformation B "2.5.12.6" "id-doa-consumerKnowledge" SupplierAndConsumers B "2.5.12.7" "id-doa-secondaryShadows" -HierarchicalAgreement S dop.oid "agreement.2.5.19.2" -SuperiorToSubordinate S dop.oid "establish.rolea.2.5.19.2" +HierarchicalAgreement S dop.oid "agreement.2.5.19.2" +SuperiorToSubordinate S dop.oid "establish.rolea.2.5.19.2" SuperiorToSubordinateModification S dop.oid "modify.rolea.2.5.19.2" -SubordinateToSuperior S dop.oid "establish.roleb.2.5.19.2" -SubordinateToSuperior S dop.oid "modify.roleb.2.5.19.2" +SubordinateToSuperior S dop.oid "establish.roleb.2.5.19.2" +SubordinateToSuperior S dop.oid "modify.roleb.2.5.19.2" NonSpecificHierarchicalAgreement S dop.oid "agreement.2.5.19.3" -NHOBSuperiorToSubordinate S dop.oid "establish.rolea.2.5.19.3" -NHOBSuperiorToSubordinate S dop.oid "modify.rolea.2.5.19.3" -NHOBSubordinateToSuperior S dop.oid "establish.roleb.2.5.19.3" -NHOBSubordinateToSuperior S dop.oid "modify.roleb.2.5.19.3" +NHOBSuperiorToSubordinate S dop.oid "establish.rolea.2.5.19.3" +NHOBSuperiorToSubordinate S dop.oid "modify.rolea.2.5.19.3" +NHOBSubordinateToSuperior S dop.oid "establish.roleb.2.5.19.3" +NHOBSubordinateToSuperior S dop.oid "modify.roleb.2.5.19.3" ACIItem B "2.5.24.4" "id-aca-prescriptiveACI" ACIItem B "2.5.24.5" "id-aca-entryACI" -- cgit v1.2.3