diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-10-03 05:16:57 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-10-03 05:16:57 +0000 |
| commit | 8a31ec4d1904ff63c9e75af56455a5d8243768f0 (patch) | |
| tree | 61834fe17449ecf2f61f11979be79675ea8e7549 /asn1/ess | |
| parent | 00faf71e47e77e80d023cc22590ccf356ea2e7ac (diff) | |
| download | wireshark-8a31ec4d1904ff63c9e75af56455a5d8243768f0.tar.gz wireshark-8a31ec4d1904ff63c9e75af56455a5d8243768f0.tar.bz2 wireshark-8a31ec4d1904ff63c9e75af56455a5d8243768f0.zip | |
From Graeme Lunt
X420 - incorrect ExtendedBodyPart handling
ACSE - support for implicitly tagged EXTERNALs and dissection based upon direct-reference RTSE - same change for RTSE EXTERNAL handling as above CMS - support for ContentType, MessageDigest, SigningTime and CounterSignature attributes ESS - support for ESSSecurityLabel and EquivalentLabels attributes
svn path=/trunk/; revision=16071
Diffstat (limited to 'asn1/ess')
| -rw-r--r-- | asn1/ess/ExtendedSecurityServices.asn | 20 | ||||
| -rw-r--r-- | asn1/ess/ess.cnf | 5 |
2 files changed, 14 insertions, 11 deletions
diff --git a/asn1/ess/ExtendedSecurityServices.asn b/asn1/ess/ExtendedSecurityServices.asn index 7ba3b89271..69b2979c6d 100644 --- a/asn1/ess/ExtendedSecurityServices.asn +++ b/asn1/ess/ExtendedSecurityServices.asn @@ -139,13 +139,13 @@ ContentReference ::= SEQUENCE { -- Section 3.2 --- ASN2ETH cant handle sets yet ---ESSSecurityLabel ::= SET { --- security-policy-identifier SecurityPolicyIdentifier, --- security-classification SecurityClassification OPTIONAL, --- privacy-mark ESSPrivacyMark OPTIONAL, --- security-categories SecurityCategories OPTIONAL } --- + +ESSSecurityLabel ::= SET { + security-policy-identifier SecurityPolicyIdentifier, + security-classification SecurityClassification OPTIONAL, + privacy-mark ESSPrivacyMark OPTIONAL, + security-categories SecurityCategories OPTIONAL } + -- id-aa-securityLabel OBJECT IDENTIFIER ::= { iso(1) member-body(2) -- us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) id-aa(2) 2} @@ -174,7 +174,7 @@ SecurityCategories ::= SET OF SecurityCategory SecurityCategory ::= SEQUENCE { type [0] OBJECT IDENTIFIER, - value [1] ANY + value [1] EXPLICIT ANY } --Note: The aforementioned SecurityCategory syntax produces identical @@ -193,8 +193,8 @@ SecurityCategory ::= SEQUENCE { -- Section 3.4 --- ASN2ETH cant generate code for ESSSecurityLabel yet ---EquivalentLabels ::= SEQUENCE OF ESSSecurityLabel + +EquivalentLabels ::= SEQUENCE OF ESSSecurityLabel -- id-aa-equivalentLabels OBJECT IDENTIFIER ::= { iso(1) member-body(2) -- us(840) rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) id-aa(2) 9} diff --git a/asn1/ess/ess.cnf b/asn1/ess/ess.cnf index a2eeafaafd..d4fe6fb510 100644 --- a/asn1/ess/ess.cnf +++ b/asn1/ess/ess.cnf @@ -23,9 +23,12 @@ Receipt B "1.2.840.113549.1.9.16.1.1" "id-ct-receipt" ContentHints B "1.2.840.113549.1.9.16.2.4" "id-aa-contentHint" MsgSigDigest B "1.2.840.113549.1.9.16.2.5" "id-aa-msgSigDigest" ContentReference B "1.2.840.113549.1.9.16.2.10" "id-aa-contentReference" +ESSSecurityLabel B "1.2.840.113549.1.9.16.2.2" "id-aa-securityLabel" +EquivalentLabels B "1.2.840.113549.1.9.16.2.9" "id-aa-equivalentLabels" MLExpansionHistory B "1.2.840.113549.1.9.16.2.3" "id-aa-mlExpandHistory" SigningCertificate B "1.2.840.113549.1.9.16.2.12" "id-aa-signingCertificate" + #.NO_EMIT #.TYPE_RENAME @@ -33,7 +36,7 @@ SigningCertificate B "1.2.840.113549.1.9.16.2.12" "id-aa-signingCertificate" #.FIELD_RENAME #.FN_BODY SecurityCategory/type - offset = dissect_ber_object_identifier(FALSE, pinfo, tree, tvb, offset, + offset = dissect_ber_object_identifier(implicit_tag, pinfo, tree, tvb, offset, hf_ess_SecurityCategory_type_OID, object_identifier_id); #.FN_BODY SecurityCategory/value |