osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Make global algorithm_id in x509af dissector a direct_reference instead. Bug 9573 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9573). Removes valgrind warnings as well as just being Good Code. 

svn path=/trunk/; revision=54647
This commit is contained in:
Michael Mann 2014-01-08 04:55:59 +00:00
parent bf284da2ee
commit 92a567f20d
9 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/cms/cms.cnf
View File

@ -154,7 +154,7 @@ RevocationInfoChoice/other otherRIC
old_offset = get_ber_length(tvb, old_offset, NULL, NULL);
if(content_tvb)
cms_verify_msg_digest(pi, content_tvb, x509af_get_last_algorithm_id(), tvb, old_offset);
cms_verify_msg_digest(pi, content_tvb, actx->external.direct_reference, tvb, old_offset);
#.FN_PARS SMIMECapability/capability
FN_VARIANT = _str HF_INDEX = hf_cms_attrType VAL_PTR = &object_identifier_id

2
asn1/pkcs12/packet-pkcs12-template.c
View File

@ -241,7 +241,7 @@ int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted
return FALSE;
}
encryption_algorithm = x509af_get_last_algorithm_id();
encryption_algorithm = actx->external.direct_reference;
/* these are the only encryption schemes we understand for now */
if(!strcmp(encryption_algorithm, PKCS12_PBE_3DES_SHA1_OID)) {

6
asn1/x509af/packet-x509af-template.c
View File

@ -53,14 +53,8 @@ static int hf_x509af_extension_id = -1;
/* Initialize the subtree pointers */
static gint ett_pkix_crl = -1;
#include "packet-x509af-ett.c"
static const char *algorithm_id;
#include "packet-x509af-fn.c"
const char *x509af_get_last_algorithm_id(void) {
return algorithm_id;
}
static int
dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_)
{

2
asn1/x509af/packet-x509af-template.h
View File

@ -28,7 +28,5 @@
#include "packet-x509af-exp.h"
extern const char* x509af_get_last_algorithm_id(void);
#endif /* PACKET_X509AF_H */

10
asn1/x509af/x509af.cnf
View File

@ -65,21 +65,21 @@ CertificateList/signedCertificateList/revokedCertificates/_item/userCertificate
#.END
#.FN_PARS AlgorithmIdentifier/algorithmId
FN_VARIANT = _str HF_INDEX = hf_x509af_algorithm_id VAL_PTR = &algorithm_id
FN_VARIANT = _str HF_INDEX = hf_x509af_algorithm_id VAL_PTR = &actx->external.direct_reference
#.FN_BODY AlgorithmIdentifier/algorithmId
const char *name;
%(DEFAULT_BODY)s
if(algorithm_id) {
name = oid_resolved_from_string(algorithm_id);
if(actx->external.direct_reference) {
name = oid_resolved_from_string(actx->external.direct_reference);
proto_item_append_text(tree, " (%%s)", name ? name : algorithm_id);
proto_item_append_text(tree, " (%%s)", name ? name : actx->external.direct_reference);
}
#.FN_BODY AlgorithmIdentifier/parameters
offset=call_ber_oid_callback(algorithm_id, tvb, offset, actx->pinfo, tree, NULL);
offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL);
#.FN_PARS Extension/extnId
FN_VARIANT = _str HF_INDEX = hf_x509af_extension_id VAL_PTR = &actx->external.direct_reference

2
epan/dissectors/packet-cms.c
View File

@ -1530,7 +1530,7 @@ dissect_cms_MessageDigest(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
old_offset = get_ber_length(tvb, old_offset, NULL, NULL);
if(content_tvb)
cms_verify_msg_digest(pi, content_tvb, x509af_get_last_algorithm_id(), tvb, old_offset);
cms_verify_msg_digest(pi, content_tvb, actx->external.direct_reference, tvb, old_offset);

2
epan/dissectors/packet-pkcs12.c
View File

@ -333,7 +333,7 @@ int PBE_decrypt_data(const char *object_identifier_id_param, tvbuff_t *encrypted
return FALSE;
}
encryption_algorithm = x509af_get_last_algorithm_id();
encryption_algorithm = actx->external.direct_reference;
/* these are the only encryption schemes we understand for now */
if(!strcmp(encryption_algorithm, PKCS12_PBE_3DES_SHA1_OID)) {

24
epan/dissectors/packet-x509af.c
View File

@ -177,7 +177,6 @@ static gint ett_x509af_DSS_Params = -1;
/*--- End of included file: packet-x509af-ett.c ---*/
#line 56 "../../asn1/x509af/packet-x509af-template.c"
static const char *algorithm_id;
/*--- Included file: packet-x509af-fn.c ---*/
#line 1 "../../asn1/x509af/packet-x509af-fn.c"
@ -215,13 +214,13 @@ dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
#line 71 "../../asn1/x509af/x509af.cnf"
const char *name;
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_algorithm_id, &algorithm_id);
offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_x509af_algorithm_id, &actx->external.direct_reference);
if(algorithm_id) {
name = oid_resolved_from_string(algorithm_id);
if(actx->external.direct_reference) {
name = oid_resolved_from_string(actx->external.direct_reference);
proto_item_append_text(tree, " (%s)", name ? name : algorithm_id);
proto_item_append_text(tree, " (%s)", name ? name : actx->external.direct_reference);
}
@ -234,7 +233,7 @@ dissect_x509af_T_algorithmId(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
static int
dissect_x509af_T_parameters(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
#line 82 "../../asn1/x509af/x509af.cnf"
offset=call_ber_oid_callback(algorithm_id, tvb, offset, actx->pinfo, tree, NULL);
offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL);
@ -887,12 +886,7 @@ static void dissect_DSS_Params_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
/*--- End of included file: packet-x509af-fn.c ---*/
#line 58 "../../asn1/x509af/packet-x509af-template.c"
const char *x509af_get_last_algorithm_id(void) {
return algorithm_id;
}
#line 57 "../../asn1/x509af/packet-x509af-template.c"
static int
dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void *data _U_)
@ -1229,7 +1223,7 @@ void proto_register_x509af(void) {
"INTEGER", HFILL }},
/*--- End of included file: packet-x509af-hfarr.c ---*/
#line 99 "../../asn1/x509af/packet-x509af-template.c"
#line 93 "../../asn1/x509af/packet-x509af-template.c"
};
/* List of subtrees */
@ -1272,7 +1266,7 @@ void proto_register_x509af(void) {
&ett_x509af_DSS_Params,
/*--- End of included file: packet-x509af-ettarr.c ---*/
#line 105 "../../asn1/x509af/packet-x509af-template.c"
#line 99 "../../asn1/x509af/packet-x509af-template.c"
};
/* Register protocol */
@ -1315,7 +1309,7 @@ void proto_reg_handoff_x509af(void) {
/*--- End of included file: packet-x509af-dis-tab.c ---*/
#line 133 "../../asn1/x509af/packet-x509af-template.c"
#line 127 "../../asn1/x509af/packet-x509af-template.c"
/*XXX these should really go to a better place but since that
I have not that ITU standard, ill put it here for the time

2
epan/dissectors/packet-x509af.h
View File

@ -66,7 +66,5 @@ void dissect_x509af_Certificate_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p
/*--- End of included file: packet-x509af-exp.h ---*/
#line 30 "../../asn1/x509af/packet-x509af-template.h"
extern const char* x509af_get_last_algorithm_id(void);
#endif /* PACKET_X509AF_H */