diff options
Diffstat (limited to 'asn1/x411')
-rw-r--r-- | asn1/x411/x411.asn | 24 | ||||
-rw-r--r-- | asn1/x411/x411.cnf | 11 |
2 files changed, 23 insertions, 12 deletions
diff --git a/asn1/x411/x411.asn b/asn1/x411/x411.asn index ff901e7743..a6a5812037 100644 --- a/asn1/x411/x411.asn +++ b/asn1/x411/x411.asn @@ -1739,18 +1739,18 @@ SupplementaryInformation ::= PrintableString(SIZE (1..ub-supplementary-info-length)) -- Extension Fields ---EXTENSION ::= CLASS { --- &id ExtensionType UNIQUE, --- &Type OPTIONAL, --- &absent &Type OPTIONAL, --- &recommended Criticality DEFAULT {} ---} ---WITH SYNTAX { --- [&Type --- [IF ABSENT &absent],] --- [RECOMMENDED CRITICALITY &recommended,] --- IDENTIFIED BY &id ---} +EXTENSION ::= CLASS { + &id ExtensionType UNIQUE, + &Type OPTIONAL, + &absent &Type OPTIONAL, + &recommended Criticality DEFAULT {} +} +WITH SYNTAX { + [&Type + [IF ABSENT &absent],] + [RECOMMENDED CRITICALITY &recommended,] + IDENTIFIED BY &id +} ExtensionType ::= CHOICE { standard-extension [0] StandardExtension --(0..ub-extension-types)--, diff --git a/asn1/x411/x411.cnf b/asn1/x411/x411.cnf index 30b6a6f747..c27af7ca90 100644 --- a/asn1/x411/x411.cnf +++ b/asn1/x411/x411.cnf @@ -8,9 +8,11 @@ Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 #.IMPORT ../x509af/x509af-exp.cnf #.EXPORTS +EXTENSION Content ContentIdentifier ContentLength +ContentType Credentials EncodedInformationTypes EncodedInformationTypesConstraints @@ -27,11 +29,15 @@ MessageSubmissionEnvelope MessageSubmissionIdentifier MessageSubmissionTime MessageToken +MTSOriginatorName ORAddress ORAddressAndOrDirectoryName ORName +OriginalEncodedInformationTypes OriginatingMTACertificate OtherMessageDeliveryFields +PerMessageIndicators +PerRecipientProbeSubmissionFields ProbeSubmissionEnvelope ProbeSubmissionIdentifier ProbeSubmissionTime @@ -47,6 +53,9 @@ UniversalOrBMPString NonDeliveryReasonCode NonDeliveryDiagnosticCode +# Forward declaration of Classes + + #.TYPE_RENAME MTABindArgument/authenticated AuthenticatedArgument MTABindResult/authenticated AuthenticatedResult @@ -253,6 +262,7 @@ ContentCorrelator B "2.6.4.3.3" "id-att-content-correlator" ContentIdentifier B "2.6.4.3.4" "id-att-content-identifier" ContentIntegrityCheck B "2.6.4.3.5" "id-att-content-inetgrity-check" ContentLength B "2.6.4.3.6" "id-att-content-length" +ExtendedContentType B "2.6.4.3.8" "id-att-content-type" ConversionWithLossProhibited B "2.6.4.3.9" "id-att-conversion-with-loss-prohibited" DeferredDeliveryTime B "2.6.4.3.51" "id-att-deferred-delivery-time" DeliveryFlags B "2.6.4.3.13" "id-att-delivery-flags" @@ -882,3 +892,4 @@ AddrTeletexString TeletexPersonalName/surname TeletexPersonalName/given-name Tel } #.END + |