osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

the dissector for AssertionValue that is implemented in the template file 

did not check the implicit_tag flag and caused extensiblematch filters to show up as malformed packets.




svn path=/trunk/; revision=18540
This commit is contained in:
Ronnie Sahlberg 2006-06-22 10:29:49 +00:00
parent a41dc5d874
commit 946a39d4fc
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
asn1/ldap/packet-ldap-template.c
View File

@ -254,7 +254,7 @@ static char *assertionvalue_string=NULL;
* display it as a string, othervise just display it in hex.
*/
static int
dissect_ldap_AssertionValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index)
dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, int hf_index)
{
gint8 class;
gboolean pc, ind, is_ascii;
@ -262,8 +262,12 @@ dissect_ldap_AssertionValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
guint32 len, i;
const guchar *str;
offset=get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset=get_ber_length(NULL, tvb, offset, &len, &ind);
if(!implicit_tag){
offset=get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset=get_ber_length(NULL, tvb, offset, &len, &ind);
} else {
len=tvb_length_remaining(tvb,offset);
}
if(len==0){
return offset;

8
epan/dissectors/packet-ldap.c
View File

@ -414,8 +414,12 @@ dissect_ldap_AssertionValue(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset
guint32 len, i;
const guchar *str;
offset=get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset=get_ber_length(NULL, tvb, offset, &len, &ind);
if(!implicit_tag){
offset=get_ber_identifier(tvb, offset, &class, &pc, &tag);
offset=get_ber_length(NULL, tvb, offset, &len, &ind);
} else {
len=tvb_length_remaining(tvb,offset);
}
if(len==0){
return offset;