Visitar URL original
Remove quadratic binary REAL mantissa decoding · pyasn1/pyasn1@ce3ec33 · GitHub
Skip to content

Commit ce3ec33

Browse files
committed
Remove quadratic binary REAL mantissa decoding
1 parent 72e4803 commit ce3ec33

4 files changed

Lines changed: 29 additions & 6 deletions

File tree

‎pyasn1/codec/ber/decoder.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -587,12 +587,7 @@ def valueDecoder(self, substrate, asn1Spec,
587587

588588
elif b == 2: # encbase = 16
589589
e *= 4
590-
p = 0
591-
592-
while chunk: # value
593-
p <<= 8
594-
p |= chunk[0]
595-
chunk = chunk[1:]
590+
p = int.from_bytes(bytes(chunk), 'big')
596591

597592
if fo & 0x40: # sign bit
598593
p = -p

‎tests/codec/ber/test_decoder.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -765,6 +765,16 @@ def testLargeBinaryRoundTrip(self):
765765
assert tuple(value) == (-1, 2, 76354972)
766766
assert rest == b''
767767

768+
def testLongBinaryMantissa(self):
769+
mantissa = b'\x80' + b'\x01' * 511
770+
content = b'\x80\x00' + mantissa
771+
substrate = b'\x09' + encode_length(len(content)) + content
772+
773+
for asn1Spec in (None, univ.Real()):
774+
value, rest = decoder.decode(substrate, asn1Spec=asn1Spec)
775+
assert tuple(value) == (int.from_bytes(mantissa, 'big'), 2, 0)
776+
assert rest == b''
777+
768778
def testLongFormBinaryRealExponentLength(self):
769779
value, rest = decoder.decode(
770780
bytes((9, 6, 0x83, 3, 0x0f, 0x42, 0x40, 1))

‎tests/codec/cer/test_decoder.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,15 @@ def testLargeBinaryRoundTrip(self):
8989
assert tuple(value) == (-1, 2, 76354972)
9090
assert rest == b''
9191

92+
def testLongBinaryMantissa(self):
93+
mantissa = b'\x80' + b'\x01' * 255
94+
content = b'\x80\x00' + mantissa
95+
substrate = b'\x09\x82\x01\x02' + content
96+
value, rest = decoder.decode(substrate)
97+
98+
assert tuple(value) == (int.from_bytes(mantissa, 'big'), 2, 0)
99+
assert rest == b''
100+
92101

93102
class SequenceDecoderWithUntaggedOpenTypesTestCase(BaseTestCase):
94103
def setUp(self):

‎tests/codec/der/test_decoder.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,15 @@ def testLargeBinaryRoundTrip(self):
104104
assert tuple(value) == (-1, 2, 76354972)
105105
assert rest == b''
106106

107+
def testLongBinaryMantissa(self):
108+
mantissa = b'\x80' + b'\x01' * 255
109+
content = b'\x80\x00' + mantissa
110+
substrate = b'\x09\x82\x01\x02' + content
111+
value, rest = decoder.decode(substrate, asn1Spec=univ.Real())
112+
113+
assert tuple(value) == (int.from_bytes(mantissa, 'big'), 2, 0)
114+
assert rest == b''
115+
107116

108117
class SequenceDecoderWithUntaggedOpenTypesTestCase(BaseTestCase):
109118
def setUp(self):

0 commit comments

Comments
 (0)