diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-11-06 20:16:59 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-11-06 20:16:59 +0000 |
| commit | 2555a2f6fb16b3bdadd4d37b6750011b9cfbc701 (patch) | |
| tree | 207e92aadcdb160519deb4e42a432f7150a2b257 /asn1/dap | |
| parent | 624b58c099eafc8cb94a4f782d2aa9964d752072 (diff) | |
as2wrs now handles EXTERNAL(direct-reference requires no special handling).
svn path=/trunk/; revision=23382
Diffstat (limited to 'asn1/dap')
| -rw-r--r-- | asn1/dap/Makefile.common | 4 | ||||
| -rw-r--r-- | asn1/dap/dap.asn | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/asn1/dap/Makefile.common b/asn1/dap/Makefile.common index 92d6ce3b93..b8d839bda6 100644 --- a/asn1/dap/Makefile.common +++ b/asn1/dap/Makefile.common @@ -50,7 +50,6 @@ SRC_FILES = \ A2W_FLAGS= -b -e -X -T EXTRA_CNF= \ - ../acse/acse-exp.cnf \ ../disp/disp-exp.cnf \ ../dsp/dsp-exp.cnf \ ../pkixcrmf/crmf-exp.cnf \ @@ -59,9 +58,6 @@ EXTRA_CNF= \ ../x509if/x509if-exp.cnf \ ../x509sat/x509sat-exp.cnf -../acse/acse-exp.cnf: - (cd ../acse && $(MAKE_CNF_EXPORT)) - ../disp/disp-exp.cnf: (cd ../disp && $(MAKE_CNF_EXPORT)) diff --git a/asn1/dap/dap.asn b/asn1/dap/dap.asn index 61e3af7113..e478d9dc52 100644 --- a/asn1/dap/dap.asn +++ b/asn1/dap/dap.asn @@ -70,13 +70,11 @@ IMPORTS remote-operations(4) useful-definitions(7) version1(0)} InvokeId FROM Remote-Operations-Generic-ROS-PDUs {joint-iso-itu-t - remote-operations(4) generic-ROS-PDUs(6) version1(0)} + remote-operations(4) generic-ROS-PDUs(6) version1(0)}; -- from RFC 2025 -- SPKM-ERROR, SPKM-REP-TI, SPKM-REQ -- FROM SpkmGssTokens {iso(1) identified-organization(3) dod(6) internet(1) -- security(5) mechanisms(5) spkm(1) spkmGssTokens(10)}; - EXTERNALt - FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) acse1(1) version1(1)}; -- Common data types --CommonArguments ::= SET { @@ -301,7 +299,7 @@ DirectoryBindArgument ::= SET { Credentials ::= CHOICE { simple [0] SimpleCredentials, strong [1] StrongCredentials, - externalProcedure [2] EXTERNALt, + externalProcedure [2] EXTERNAL, spkm [3] SpkmCredentials } |