diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-11-22 17:01:56 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-11-22 17:01:56 +0000 |
| commit | 096395d7f43170d2dc7068e44d681a97064badc4 (patch) | |
| tree | 5453f0a700515f572df73ff3cfae52df70deacdf /tools | |
| parent | 05af2b8952738030b337f7fe26d167d2ac227f2a (diff) | |
Handle lenght restriction extension of restricted strings.
Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4251
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31048 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/asn2wrs.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/asn2wrs.py b/tools/asn2wrs.py index f45be44a4b..8899ddcb9f 100755 --- a/tools/asn2wrs.py +++ b/tools/asn2wrs.py @@ -4785,7 +4785,7 @@ class RestrictedCharacterStringType (CharacterStringType): elif (ectx.Per() and self.HasPermAlph()): body = ectx.eth_fn_call('dissect_%(ER)s_restricted_character_string', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), - ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(ALPHABET)s', '%(ALPHABET_LEN)s'), + ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(EXT)s', '%(ALPHABET)s', '%(ALPHABET_LEN)s'), ('%(VAL_PTR)s',),)) elif (ectx.Per()): if (self.eth_tsname() == 'GeneralString'): @@ -4794,15 +4794,15 @@ class RestrictedCharacterStringType (CharacterStringType): elif (self.eth_tsname() == 'GeneralizedTime'): body = ectx.eth_fn_call('dissect_%(ER)s_VisibleString', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), - ('%(MIN_VAL)s', '%(MAX_VAL)s',),)) + ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(EXT)s',),)) elif (self.eth_tsname() == 'UTCTime'): body = ectx.eth_fn_call('dissect_%(ER)s_VisibleString', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), - ('%(MIN_VAL)s', '%(MAX_VAL)s',),)) + ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(EXT)s',),)) else: body = ectx.eth_fn_call('dissect_%(ER)s_%(STRING_TYPE)s', ret='offset', par=(('%(TVB)s', '%(OFFSET)s', '%(ACTX)s', '%(TREE)s', '%(HF_INDEX)s'), - ('%(MIN_VAL)s', '%(MAX_VAL)s',),)) + ('%(MIN_VAL)s', '%(MAX_VAL)s', '%(EXT)s',),)) else: body = '#error Can not decode %s' % (tname) return body |