summaryrefslogtreecommitdiff
path: root/asn1/x509sat/x509sat.cnf
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2013-12-19 09:19:33 +0000
committerGuy Harris <guy@alum.mit.edu>2013-12-19 09:19:33 +0000
commit317b82898664af0f0fe71c513995bb137d0a3c57 (patch)
tree37b1f0304675d62189eebd6faaa8d8383eba893e /asn1/x509sat/x509sat.cnf
parent4a346b71882c782cf070e382a4bf718150b192d8 (diff)
downloadwireshark-317b82898664af0f0fe71c513995bb137d0a3c57.tar.gz
Use proto_tree_add_item() or tvb_get_string_enc() instead of
tvb_get_unicode_string(). If there's an indication that the encoding is UCS-2, use that, otherwise use UTF-16. (For example, "BMP" stands for "Basic Multilingual Plane", which is the part of Unicode that can be encoded in 16 bits, hence UCS-2.) In the description of the "Use Heuristics for UDP" preference for the XML dissector, note that it's not just trying to recognize XML in UCS-2, it's trying to recognize XML in *big-endian* UCS-2. svn path=/trunk/; revision=54245
Diffstat (limited to 'asn1/x509sat/x509sat.cnf')
-rw-r--r--asn1/x509sat/x509sat.cnf2
1 files changed, 1 insertions, 1 deletions
diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf
index bbeab761e3..b1044fe89f 100644
--- a/asn1/x509sat/x509sat.cnf
+++ b/asn1/x509sat/x509sat.cnf
@@ -385,7 +385,7 @@ XDayOf/fifth fifth_dayof
if (! wide_tvb) {
return offset;
}
- string = tvb_get_unicode_string (wmem_packet_scope(), wide_tvb, 0, tvb_length(wide_tvb), ENC_BIG_ENDIAN);
+ string = tvb_get_string_enc (wmem_packet_scope(), wide_tvb, 0, tvb_length(wide_tvb), ENC_UCS_2|ENC_BIG_ENDIAN);
proto_item_append_text(actx->created_item, " %s", string);
#.END