diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-04-07 15:39:55 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-04-07 22:46:30 +0000 |
| commit | 26f46d40e9cc0feab71280fbff57d70beac20acc (patch) | |
| tree | 13034fec7da0707974104eddd814b34bc9fe3349 /asn1/x509sat | |
| parent | a5cb72fe9eadfaf8cb0aefccb106a7eaad9266c9 (diff) | |
Handle string types with somewhat appropriate encodings.
For various string types defined in X.680, use the appropriate encoding,
or ENC_ASCII|ENC_NA in some cases where we don't have an appropriate
encoding yet.
This most significantly fixes the handling of BMPString and
UniversalString, which are supersets of ASCII (Unicode Basic
Multilingual Plane and Unicode, respectively), but don't encode ASCII
characters as single octets. It also fixes UTF8String to, well,
properly recognize UTF-8.
This also lets us get rid of the special handling of SyntaxBMPString in
X.509sat (and, in fact, *requires* us to get rid of it, as, otherwise,
the string value appears twice).
Change-Id: I325c4e71a6110278eb23b86e0d986e6439cfc328
Reviewed-on: https://code.wireshark.org/review/994
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'asn1/x509sat')
| -rw-r--r-- | asn1/x509sat/x509sat.cnf | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/asn1/x509sat/x509sat.cnf b/asn1/x509sat/x509sat.cnf index 2d88c231fc..6ea1bf9148 100644 --- a/asn1/x509sat/x509sat.cnf +++ b/asn1/x509sat/x509sat.cnf @@ -372,20 +372,6 @@ XDayOf/third third_dayof XDayOf/fourth fourth_dayof XDayOf/fifth fifth_dayof -#.FN_PARS SyntaxBMPString VAL_PTR = &wide_tvb - -#.FN_HDR SyntaxBMPString - tvbuff_t *wide_tvb = NULL; - char *string; -#.END - -#.FN_FTR SyntaxBMPString - if (! wide_tvb) { - return offset; - } - 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 #.FN_BODY GUID |