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

Use restricted character string decoding for IA5String type 

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6246

svn path=/trunk/; revision=43203
This commit is contained in:
Pascal Quantin 2012-06-11 13:54:06 +00:00
parent 3be09ce941
commit a923c28ede
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
epan/dissectors/packet-per.c
View File

@ -518,17 +518,6 @@ DEBUG_ENTRY("dissect_per_sequence_of");
}
/* dissect a constrained IA5String that consists of the full ASCII set,
i.e. no FROM stuff limiting the alphabet
*/
guint32
dissect_per_IA5String(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension)
{
offset=dissect_per_octet_string(tvb, offset, actx, tree, hf_index, min_len, max_len, has_extension, NULL);
return offset;
}
/* XXX we don't do >64k length strings yet */
static guint32
dissect_per_restricted_character_string_sorted(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension _U_,const char *alphabet, int alphabet_length, tvbuff_t **value_tvb)
@ -656,7 +645,8 @@ DEBUG_ENTRY("dissect_per_restricted_character_string");
/* ALIGNED PER does not do any remapping of chars if
bitsperchar is 8
*/
if(bits_per_char==8){
/* If alphabet is not provided, do not do any remapping either */
if((bits_per_char==8) || (alphabet==NULL)){
buf[char_pos]=val;
} else {
if (val < alphabet_length){
@ -713,6 +703,18 @@ dissect_per_restricted_character_string(tvbuff_t *tvb, guint32 offset, asn1_ctx_
return dissect_per_restricted_character_string_sorted(tvb, offset, actx, tree, hf_index, min_len, max_len, has_extension, alphabet_ptr, alphabet_length, value_tvb);
}
/* dissect a constrained IA5String that consists of the full ASCII set,
i.e. no FROM stuff limiting the alphabet
*/
guint32
dissect_per_IA5String(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension)
{
offset=dissect_per_restricted_character_string_sorted(tvb, offset, actx, tree, hf_index, min_len, max_len, has_extension,
NULL, 128, NULL);
return offset;
}
guint32
dissect_per_NumericString(tvbuff_t *tvb, guint32 offset, asn1_ctx_t *actx, proto_tree *tree, int hf_index, int min_len, int max_len, gboolean has_extension)
{