diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-11-06 20:21:09 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-11-06 20:21:09 +0000 |
| commit | 998eabe31f309e59858b86ae9b0641f9da6f68e5 (patch) | |
| tree | 645c5349b8280321d6e97801f226b3fa8f1ed239 /asn1/disp | |
| parent | 2555a2f6fb16b3bdadd4d37b6750011b9cfbc701 (diff) | |
as2wrs now handles EXTERNAL(direct-reference requires no special handling).
svn path=/trunk/; revision=23383
Diffstat (limited to 'asn1/disp')
| -rw-r--r-- | asn1/disp/Makefile.common | 4 | ||||
| -rw-r--r-- | asn1/disp/disp.asn | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/asn1/disp/Makefile.common b/asn1/disp/Makefile.common index 303a47a6d6..d7af20cc80 100644 --- a/asn1/disp/Makefile.common +++ b/asn1/disp/Makefile.common @@ -49,16 +49,12 @@ SRC_FILES = \ A2W_FLAGS= -b -e -X -T EXTRA_CNF= \ - ../acse/acse-exp.cnf \ ../dap/dap-exp.cnf \ ../dop/dop-exp.cnf \ ../dsp/dsp-exp.cnf \ ../x509af/x509af-exp.cnf \ ../x509if/x509if-exp.cnf -../acse/acse-exp.cnf: - (cd ../acse && $(MAKE_CNF_EXPORT)) - ../dap/dap-exp.cnf: (cd ../dap && $(MAKE_CNF_EXPORT)) diff --git a/asn1/disp/disp.asn b/asn1/disp/disp.asn index 0ab0cfbc58..f8df9f8624 100644 --- a/asn1/disp/disp.asn +++ b/asn1/disp/disp.asn @@ -47,8 +47,6 @@ IMPORTS shadowConsumerInitiatedAC, shadowSupplierInitiatedAC FROM DirectoryInformationShadowProtocol {joint-iso-itu-t ds(5) module(1) disp(16) 4} - EXTERNALt - FROM ACSE-1 {joint-iso-itu-t association-control(2) modules(0) acse1(1) version1(1)} AlgorithmIdentifier, CertificationPath, ENCRYPTED{}, SIGNATURE{}, SIGNED{} FROM AuthenticationFramework {joint-iso-itu-t ds(5) module(1) authenticationFramework(7) 4} @@ -193,7 +191,7 @@ CoordinateShadowUpdateArgumentData ::= CHOICE {standard ENUMERATED {noChanges(0), incremental(1), total(2)}, - other EXTERNALt}, + other EXTERNAL}, securityParameters SecurityParameters OPTIONAL} --} -- expand OPTIONALLY-PROTECTED macro @@ -250,7 +248,7 @@ RequestShadowUpdateArgumentData ::= lastUpdate Time OPTIONAL, requestedStrategy CHOICE {standard ENUMERATED {incremental(1), total(2)}, - other EXTERNALt}, + other EXTERNAL}, securityParameters SecurityParameters OPTIONAL} --} -- expand OPTIONALLY-PROTECTED macro @@ -316,7 +314,7 @@ RefreshInformation ::= CHOICE { noRefresh NULL, total [0] TotalRefresh, incremental [1] IncrementalRefresh, - otherStrategy EXTERNALt + otherStrategy EXTERNAL } TotalRefresh ::= SEQUENCE { |