diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-04-06 20:22:19 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-04-06 20:22:19 +0000 |
| commit | 176c3040901dcae94e0d2e1fc0b58f75bc4a4fab (patch) | |
| tree | ce15c2ed38445061fb6d6c487d944a245d2e43ea /epan | |
| parent | b3ca18378d513290e23876d50446a164536750c6 (diff) | |
Try to fix Bug 4648 - pkcs12 ASN1 generated dissector differs from epan/dissectors version.
It's a pain to get these circular dependencies right.
svn path=/trunk/; revision=32409
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c index 65e0aa1860..716bd01d9a 100644 --- a/epan/dissectors/packet-pkcs12.c +++ b/epan/dissectors/packet-pkcs12.c @@ -494,7 +494,7 @@ dissect_pkcs12_T_version(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse static const ber_sequence_t DigestInfo_sequence[] = { - { &hf_pkcs12_digestAlgorithm, -1/*imported*/, -1/*imported*/, BER_FLAGS_NOOWNTAG, dissect_cms_DigestAlgorithmIdentifier }, + { &hf_pkcs12_digestAlgorithm, BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_cms_DigestAlgorithmIdentifier }, { &hf_pkcs12_digest , BER_CLASS_UNI, BER_UNI_TAG_OCTETSTRING, BER_FLAGS_NOOWNTAG, dissect_cms_Digest }, { NULL, 0, 0, 0, NULL } }; @@ -800,7 +800,7 @@ dissect_pkcs12_EncryptedData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o dissector_handle=create_dissector_handle(dissect_PrivateKeyInfo_PDU, proto_pkcs12); - dissector_change_string("ber.oid", (gchar*) object_identifier_id, dissector_handle); + dissector_change_string("ber.oid", object_identifier_id, dissector_handle); PBE_decrypt_data(object_identifier_id, encrypted_tvb, actx, actx->created_item); |