diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2007-05-13 20:58:29 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2007-05-13 20:58:29 +0000 |
| commit | c01f3829742dacd6d94dc50be54537661bad0581 (patch) | |
| tree | eb3da0d69d5bc62ca587ebd999b6beacd693f168 /asn1/cms/cms.cnf | |
| parent | b80cb43018aa49bac3e24cabca009ca0471cd579 (diff) | |
Second step in introducing asn context to BER dissectors just like in PER.
svn path=/trunk/; revision=21753
Diffstat (limited to 'asn1/cms/cms.cnf')
| -rw-r--r-- | asn1/cms/cms.cnf | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/asn1/cms/cms.cnf b/asn1/cms/cms.cnf index 95049ccc6f..d6d36a16a9 100644 --- a/asn1/cms/cms.cnf +++ b/asn1/cms/cms.cnf @@ -25,20 +25,20 @@ SignatureValue UnsignedAttributes #.REGISTER -ContentInfo B "1.2.840.113549.1.9.16.1.6" "id-ct-contentInfo" -#OctetString B "1.2.840.113549.1.7.1" "id-data" see x509sat.cnf -SignedData B "1.2.840.113549.1.7.2" "id-signedData" -EnvelopedData B "1.2.840.113549.1.7.3" "id-envelopedData" -DigestedData B "1.2.840.113549.1.7.5" "id-digestedData" -EncryptedData B "1.2.840.113549.1.7.6" "id-encryptedData" -AuthenticatedData B "1.2.840.113549.1.9.16.1.2" "id-ct-authenticatedData" +ContentInfo B "1.2.840.113549.1.9.16.1.6" "id-ct-contentInfo" +#OctetString B "1.2.840.113549.1.7.1" "id-data" see x509sat.cnf +SignedData B "1.2.840.113549.1.7.2" "id-signedData" +EnvelopedData B "1.2.840.113549.1.7.3" "id-envelopedData" +DigestedData B "1.2.840.113549.1.7.5" "id-digestedData" +EncryptedData B "1.2.840.113549.1.7.6" "id-encryptedData" +AuthenticatedData B "1.2.840.113549.1.9.16.1.2" "id-ct-authenticatedData" -ContentType B "1.2.840.113549.1.9.3" "id-contentType" -MessageDigest B "1.2.840.113549.1.9.4" "id-messageDigest" -SigningTime B "1.2.840.113549.1.9.5" "id-signingTime" -Countersignature B "1.2.840.113549.1.9.6" "id-counterSignature" +ContentType B "1.2.840.113549.1.9.3" "id-contentType" +MessageDigest B "1.2.840.113549.1.9.4" "id-messageDigest" +SigningTime B "1.2.840.113549.1.9.5" "id-signingTime" +Countersignature B "1.2.840.113549.1.9.6" "id-counterSignature" -ContentInfo B "2.6.1.4.18" "id-et-pkcs7" +ContentInfo B "2.6.1.4.18" "id-et-pkcs7" IssuerAndSerialNumber B "1.3.6.1.4.1.311.16.4" "ms-oe-encryption-key-preference" SMIMECapabilities B "1.2.840.113549.1.9.15" "id-smime-capabilities" @@ -80,7 +80,7 @@ EncryptedContentInfo/contentType encryptedContentType } #.FN_BODY ContentInfo/content - offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY EncapsulatedContentInfo/eContent @@ -92,11 +92,11 @@ EncryptedContentInfo/contentType encryptedContentType int content_offset; /* XXX Do we care about printing out the octet string? */ - offset = dissect_cms_OCTET_STRING(FALSE, tvb, offset, pinfo, NULL, hf_cms_eContent); + offset = dissect_cms_OCTET_STRING(FALSE, tvb, offset, actx, NULL, hf_cms_eContent); pdu_offset = get_ber_identifier(tvb, pdu_offset, &class, &pc, &tag); content_offset = pdu_offset = get_ber_length(tree, tvb, pdu_offset, &len, &ind); - pdu_offset = call_ber_oid_callback(object_identifier_id, tvb, pdu_offset, pinfo, top_tree ? top_tree : tree); + pdu_offset = call_ber_oid_callback(object_identifier_id, tvb, pdu_offset, actx->pinfo, top_tree ? top_tree : tree); /* save the content for checking the message digest */ content_tvb = tvb_new_subset(tvb, content_offset, len, -1); @@ -105,7 +105,7 @@ EncryptedContentInfo/contentType encryptedContentType FN_VARIANT = _str HF_INDEX = hf_cms_ci_contentType VAL_PTR = &object_identifier_id #.FN_BODY OtherKeyAttribute/keyAttr - offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_PARS Attribute/attrType @@ -123,7 +123,7 @@ EncryptedContentInfo/contentType encryptedContentType #.FN_BODY AttributeValue - offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_BODY MessageDigest proto_item *pi; @@ -156,7 +156,7 @@ EncryptedContentInfo/contentType encryptedContentType #.FN_BODY T_parameters - offset=call_ber_oid_callback(object_identifier_id, tvb, offset, pinfo, tree); + offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); #.FN_PARS RC2ParameterVersion |