diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2006-05-08 17:46:58 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2006-05-08 17:46:58 +0000 |
| commit | e0f8325deb24244b16af10f7dc3c09b8a5afeb8e (patch) | |
| tree | 1e4d3a4299e396ddc9873da36af287534c3a1a7d /asn1/x420 | |
| parent | c725ebe2420ce6c43a4538a8be4ec0c8fd329c41 (diff) | |
Better split between dissectors and fixes for s4406 SEQ OF defined extensions
svn path=/trunk/; revision=18108
Diffstat (limited to 'asn1/x420')
| -rw-r--r-- | asn1/x420/x420-exp.cnf | 6 | ||||
| -rw-r--r-- | asn1/x420/x420.cnf | 14 |
2 files changed, 17 insertions, 3 deletions
diff --git a/asn1/x420/x420-exp.cnf b/asn1/x420/x420-exp.cnf index 5596ecc11c..61af6bf794 100644 --- a/asn1/x420/x420-exp.cnf +++ b/asn1/x420/x420-exp.cnf @@ -1,12 +1,18 @@ #.IMPORT_TAG InformationObject BER_CLASS_ANY/*choice*/ -1/*choice*/ +IPM BER_CLASS_UNI BER_UNI_TAG_SEQUENCE ORDescriptor BER_CLASS_UNI BER_UNI_TAG_SET ExtensionsField BER_CLASS_UNI BER_UNI_TAG_SET +MessageParameters BER_CLASS_UNI BER_UNI_TAG_SET +IPN BER_CLASS_UNI BER_UNI_TAG_SET #.END #.TYPE_ATTR InformationObject TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = VALS(x420_InformationObject_vals) BITMASK = 0 +IPM TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 ORDescriptor TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 ExtensionsField TYPE = FT_UINT32 DISPLAY = BASE_DEC STRINGS = NULL BITMASK = 0 +MessageParameters TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 +IPN TYPE = FT_NONE DISPLAY = BASE_NONE STRINGS = NULL BITMASK = 0 #.END diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf index d46da6e9c7..9eed9c8f3d 100644 --- a/asn1/x420/x420.cnf +++ b/asn1/x420/x420.cnf @@ -1,3 +1,6 @@ +#.TYPE_ATTR +Time TYPE = FT_STRING DISPLAY = BASE_NONE STRING = NULL BITMASK = 0 + #.MODULE_IMPORT MTSAbstractService x411 AuthenticationFramework x509af @@ -13,6 +16,9 @@ ACSE-1 acse ORDescriptor InformationObject ExtensionsField +IPM +IPN +MessageParameters #.FIELD_RENAME @@ -50,7 +56,7 @@ AbsenceAdvice B "2.6.1.19.0" "id-on-absence-advice" ChangeOfAddressAdvice B "2.6.1.19.1" "id-on-change-of-address-advice" IPMAssemblyInstructions B "2.6.1.17.2" "id-mst-assembly-instructions" -IncompleteCopy B "2.6.1.5.0" "id-hex-languages" +IncompleteCopy B "2.6.1.5.0" "id-hex-incomplete-copy" Languages B "2.6.1.5.1" "id-hex-languages" AutoSubmitted B "2.6.1.5.2" "id-hex-auto-submitted" BodyPartSignatures B "2.6.1.5.3" "id-hex-body-part-signatures" @@ -99,8 +105,8 @@ ForwardedContentParameters B "2.6.1.11.17.2.6.1.10.0" "id-ep-content-p2" InformationObject B "2.6.1.4.17.2.6.1.10.0" "id-et-content-p2" #p722 ForwardedContentParameters B "2.6.1.11.17.1.3.26.0.4406.0.4.1" "id-ep-content-p772" -# this will display as P22 for now -InformationObject B "2.6.1.4.17.1.3.26.0.4406.0.4.1" "id-et-content-p772" + + # PKCS#7Bodypart {id-et 18} defined in cms.cnf #.FN_PARS IPMSExtension/type @@ -162,3 +168,5 @@ InformationObject B "2.6.1.4.17.1.3.26.0.4406.0.4.1" "id-et-content-p772" /* XXX Not implemented yet */ +#.END + |