aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2004-11-14 08:50:37 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2004-11-14 08:50:37 +0000
commit20697638ac921080200b704140c7db6b422cc8fa (patch)
tree73ce9132908d4d7c8b970c9d2cd9fe8651a14e2c /epan
parent9f9a03119cfddff3d5e6f04d99fbff25748d979f (diff)
downloadwireshark-20697638ac921080200b704140c7db6b422cc8fa.tar.gz
wireshark-20697638ac921080200b704140c7db6b422cc8fa.tar.bz2
wireshark-20697638ac921080200b704140c7db6b422cc8fa.zip
make octet string also allow for utf8strings
svn path=/trunk/; revision=12524
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ber.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index b912ddcfcd..cdab3c1b87 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -343,7 +343,7 @@ printf("OCTET STRING dissect_ber_octet_string(%s) entered\n",name);
/* sanity check: we only handle Constructed Universal Sequences */
if( (class!=BER_CLASS_UNI)
- ||((tag<BER_UNI_TAG_NumericString)&&(tag!=BER_UNI_TAG_OCTETSTRING)) ){
+ ||((tag<BER_UNI_TAG_NumericString)&&(tag!=BER_UNI_TAG_OCTETSTRING)&&(tag!=BER_UNI_TAG_UTF8String)) ){
proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: OctetString expected but Class:%d PC:%d Tag:%d was unexpected", class, pc, tag);
return end_offset;
}