diff options
author | Ilya Etingof <etingof@gmail.com> | 2017-09-20 22:18:12 +0200 |
---|---|---|
committer | Ilya Etingof <etingof@gmail.com> | 2017-09-20 22:20:33 +0200 |
commit | 4e00eba76716cb4c546b1d81b1357927ca6e5a93 (patch) | |
tree | ddf680f8109bcca74c61abac192b880f271e30e7 | |
parent | fc87382dd490810c6a4ba2cf803703b7f557dee2 (diff) | |
download | pyasn1-git-4e00eba76716cb4c546b1d81b1357927ca6e5a93.tar.gz |
fixed crash on exp tagged Sequence component encoding (#79)
Also EOO encoder call replaced with a constant outcome
-rw-r--r-- | CHANGES.rst | 3 | ||||
-rw-r--r-- | pyasn1/codec/ber/encoder.py | 17 | ||||
-rw-r--r-- | tests/codec/ber/test_encoder.py | 20 |
3 files changed, 37 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 461407d..d97a883 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,8 +9,11 @@ Revision 0.4.1, released XX-09-2017 Revision 0.3.6, released XX-09-2017 ----------------------------------- +- End-of-octets encoding optimized at ASN.1 encoders - The __getitem__/__setitem__ behavior of Set/Sequence and SetOf/SequenceOf objects aligned with the canonical Mapping and Sequence protocols in part +- Fixed crash in ASN.1 encoder when encoding an explicitly tagged + component of a Sequence Revision 0.3.5, released 16-09-2017 ----------------------------------- diff --git a/pyasn1/codec/ber/encoder.py b/pyasn1/codec/ber/encoder.py index ef12bb4..838d446 100644 --- a/pyasn1/codec/ber/encoder.py +++ b/pyasn1/codec/ber/encoder.py @@ -16,6 +16,10 @@ __all__ = ['encode'] class AbstractItemEncoder(object): supportIndefLenMode = 1 + # An outcome of otherwise legit call `encodeFun(eoo.endOfOctets)` + eooIntegerSubstrate = (0, 0) + eooOctetsSubstrate = ints2octs(eooIntegerSubstrate) + # noinspection PyMethodMayBeStatic def encodeTag(self, singleTag, isConstructed): tagClass, tagFormat, tagId = singleTag @@ -88,11 +92,18 @@ class AbstractItemEncoder(object): if isOctets: substrate = ints2octs(header) + substrate + + if not defModeOverride: + substrate += self.eooOctetsSubstrate + else: - substrate = ints2octs(header + substrate) + substrate = header + substrate + + if not defModeOverride: + substrate += self.eooIntegerSubstrate - if not defModeOverride: - substrate += encodeFun(eoo.endOfOctets, defMode=defModeOverride) + if not isOctets: + substrate = ints2octs(substrate) return substrate diff --git a/tests/codec/ber/test_encoder.py b/tests/codec/ber/test_encoder.py index 094ca85..78cb841 100644 --- a/tests/codec/ber/test_encoder.py +++ b/tests/codec/ber/test_encoder.py @@ -863,6 +863,26 @@ class ExpTaggedSequenceEncoderTestCase(BaseTestCase): ) == ints2octs((101, 128, 48, 128, 2, 1, 12, 0, 0, 0, 0)) +class ExpTaggedSequenceComponentEncoderTestCase(BaseTestCase): + def setUp(self): + BaseTestCase.setUp(self) + self.s = univ.Sequence( + componentType=namedtype.NamedTypes( + namedtype.NamedType('number', univ.Boolean().subtype(explicitTag=tag.Tag(tag.tagClassContext, tag.tagFormatSimple, 0))), + ) + ) + + self.s[0] = True + + def testDefMode(self): + assert encoder.encode(self.s) == ints2octs((48, 5, 160, 3, 1, 1, 1)) + + def testIndefMode(self): + assert encoder.encode( + self.s, defMode=False + ) == ints2octs((48, 128, 160, 3, 1, 1, 1, 0, 0, 0, 0)) + + class SetEncoderTestCase(BaseTestCase): def setUp(self): BaseTestCase.setUp(self) |