fixeria
/
pycrate
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

asn1rt: bug fixes

This commit is contained in:
mitshell 2017-10-06 22:32:08 +02:00
parent 2375b6f17d
commit e4f770a231
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pycrate_asn1rt/asnobj_construct.py
View File

@ -208,7 +208,7 @@ Specific attributes:
ASN1CodecPER._off[-1] += 2
if big:
# 2) not-small index value (>= 64)
ind = ASN1CodecPER.decode_intunconst(char, 0, name='I')
ind = ASN1CodecPER.decode_intunconst(char, 0)
else:
# 3) normally-small index value (< 64)
ind = char.get_uint(6)
@ -2212,14 +2212,14 @@ class _CONSTRUCT_OF(ASN1Obj):
off = 0
for (fs, fn) in frags:
for i in range(fn):
if cla.ALIGNED and ASN1CodecPER._off[-1] % 8:
if ASN1CodecPER.ALIGNED and ASN1CodecPER._off[-1] % 8:
GEN.extend( ASN1CodecPER.encode_pad_ws() )
GEN.extend( ASN1CodecPER.encode_count_ws(fs) )
for j in range(fs):
self._cont._val = self._val[off]
GEN.append( self._cont._to_per_ws() )
off += 1
if cla.ALIGNED and ASN1CodecPER._off[-1] % 8:
if ASN1CodecPER.ALIGNED and ASN1CodecPER._off[-1] % 8:
GEN.extend( ASN1CodecPER.encode_pad_ws() )
GEN.extend( ASN1CodecPER.encode_count_ws(rem) )
for i in range(rem):
@ -2227,7 +2227,7 @@ class _CONSTRUCT_OF(ASN1Obj):
GEN.append( self._cont._to_per_ws() )
off += 1
else:
if cla.ALIGNED and ASN1CodecPER._off[-1] % 8:
if ASN1CodecPER.ALIGNED and ASN1CodecPER._off[-1] % 8:
GEN.extend( ASN1CodecPER.encode_pad_ws() )
GEN.extend( ASN1CodecPER.encode_count_ws(ldet) )
for i in range(ldet):
@ -2300,14 +2300,14 @@ class _CONSTRUCT_OF(ASN1Obj):
off = 0
for (fs, fn) in frags:
for i in range(fn):
if cla.ALIGNED:
if ASN1CodecPER.ALIGNED:
GEN.extend( ASN1CodecPER.encode_pas() )
GEN.extend( ASN1CodecPER.encode_count(fs) )
for j in range(fs):
self._cont._val = self._val[off]
GEN.extend( self._cont._to_per() )
off += 1
if cla.ALIGNED and ASN1CodecPER._off[-1] % 8:
if ASN1CodecPER.ALIGNED and ASN1CodecPER._off[-1] % 8:
GEN.extend( ASN1CodecPER.encode_pad() )
GEN.extend( ASN1CodecPER.encode_count(rem) )
for i in range(rem):
@ -2315,7 +2315,7 @@ class _CONSTRUCT_OF(ASN1Obj):
GEN.extend( self._cont._to_per() )
off += 1
else:
if cla.ALIGNED and ASN1CodecPER._off[-1] % 8:
if ASN1CodecPER.ALIGNED and ASN1CodecPER._off[-1] % 8:
GEN.extend( ASN1CodecPER.encode_pad() )
GEN.extend( ASN1CodecPER.encode_count(ldet) )
for i in range(ldet):

2
pycrate_asn1rt/utils.py
View File

@ -522,7 +522,7 @@ def get_obj_at(Obj, path):
if Obj.TYPE in (TYPE_CHOICE, TYPE_SEQ, TYPE_SET, TYPE_REAL,
TYPE_EXT, TYPE_EMB_PDV, TYPE_CHAR_STR):
Obj = Obj._cont[p]
elif Cur.TYPE in (TYPE_SEQ_OF, TYPE_SET_OF):
elif Obj.TYPE in (TYPE_SEQ_OF, TYPE_SET_OF):
# p is not used
Obj = Obj._cont
elif Obj.TYPE in (TYPE_OPEN, TYPE_ANY):