diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-11-06 21:52:26 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-11-06 21:52:26 +0000 |
| commit | fb00aa074f95d84b4604ae99ccd87915316f1c84 (patch) | |
| tree | caa80290d794eeff2e047b7b38433c1ab303a6f2 /asn1/x420 | |
| parent | 6e207e3f34c40277bb73acd135c87f7f18f2f30f (diff) | |
as2wrs now handles EXTERNAL(direct-reference requires no special handling).
svn path=/trunk/; revision=23386
Diffstat (limited to 'asn1/x420')
| -rw-r--r-- | asn1/x420/ftbp.asn | 2 | ||||
| -rw-r--r-- | asn1/x420/x420.asn | 21 | ||||
| -rw-r--r-- | asn1/x420/x420.cnf | 1 |
3 files changed, 18 insertions, 6 deletions
diff --git a/asn1/x420/ftbp.asn b/asn1/x420/ftbp.asn index cc931e8ee6..9a9bb4ac67 100644 --- a/asn1/x420/ftbp.asn +++ b/asn1/x420/ftbp.asn @@ -57,7 +57,7 @@ FileTransferParameters ::= SEQUENCE { extensions [5] ExtensionsField OPTIONAL } -FileTransferData ::= SEQUENCE OF EXTERNALt +FileTransferData ::= SEQUENCE OF EXTERNAL -- This conveys a sequence of data values representing file contents; -- The rules for generating this sequence are implied by the value of the contents-type parameter. diff --git a/asn1/x420/x420.asn b/asn1/x420/x420.asn index 4ffb506e1b..92ba75b058 100644 --- a/asn1/x420/x420.asn +++ b/asn1/x420/x420.asn @@ -94,13 +94,26 @@ IMPORTS --== -- FROM IPMSObjectIdentifiers {joint-iso-itu-t mhs(6) ipms(1) modules(0) -- object-identifiers(0) version-1999(1)} ; -- - EXTERNALt - FROM ACSE-1 CertificateAssertion --== FROM CertificateExtensions {joint-iso-itu-t ds(5) module(1) certificateExtensions(26) 0}; +EXTENDED-BODY-PART-TYPE ::= CLASS { + ¶meters TYPE-IDENTIFIER OPTIONAL, + &data TYPE-IDENTIFIER +}WITH SYNTAX {[PARAMETERS ¶meters,] + DATA &data +} + +IPMS-EXTENSION ::= CLASS {&id OBJECT IDENTIFIER UNIQUE, + &Type DEFAULT NULL +}WITH SYNTAX {[VALUE &Type,] + IDENTIFIED BY &id +} + +NATIONAL-BODY-PARTS ::= CLASS {&Type +} Time ::= UTCTime @@ -294,8 +307,8 @@ BodyPart ::= CHOICE { -- Extended body part ExtendedBodyPart --{EXTENDED-BODY-PART-TYPE:IPMBodyPartTable}-- ::= SEQUENCE { - parameters [0] EXTERNALt --INSTANCE OF TYPE-IDENTIFIER-- OPTIONAL, - data EXTERNALt -- INSTANCE OF TYPE-IDENTIFIER + parameters [0] EXTERNAL --INSTANCE OF TYPE-IDENTIFIER-- OPTIONAL, + data EXTERNAL -- INSTANCE OF TYPE-IDENTIFIER } --(CONSTRAINED BY { - - must correspond to the ¶meters field and &data field of a member of -- -- IPMBodyPartTable}) diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf index 6786ddb468..fc91688c67 100644 --- a/asn1/x420/x420.cnf +++ b/asn1/x420/x420.cnf @@ -10,7 +10,6 @@ MTSAbstractService x411 #.IMPORT ../x509ce/x509ce-exp.cnf #.IMPORT ../acse/acse-exp.cnf - #.MODULE x420 x420 ftbp ftbp |