diff options
| -rw-r--r-- | asn1/pkcs12/Makefile.common | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-pkcs12.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/asn1/pkcs12/Makefile.common b/asn1/pkcs12/Makefile.common index 5942c4aca8..7bcb22af22 100644 --- a/asn1/pkcs12/Makefile.common +++ b/asn1/pkcs12/Makefile.common @@ -45,10 +45,11 @@ SRC_FILES = \ A2W_FLAGS= -b -e +# Note the order here is important, cms needs at least x509af-exp to be generated first EXTRA_CNF= \ - ../cms/cms-exp.cnf \ - ../x509if/x509if-exp.cnf \ - ../x509af/x509af-exp.cnf + ../x509if/x509if-exp.cnf \ + ../x509af/x509af-exp.cnf \ + ../cms/cms-exp.cnf ../cms/cms-exp.cnf: (cd ../cms && $(MAKE_CNF_EXPORT)) 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); |