X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=pyderasn.py;h=e08f6bad3a090204af25441d78c285fec6521034;hb=4910e3c9c30f82ca4fc8fb74d5ba3036d5046415;hp=516715a7f2e419a6d1070c03eee7f2c07bb1b895;hpb=44e10c60d857ea5e631927ac4b23365cc3b80698;p=pyderasn.git

diff --git a/pyderasn.py b/pyderasn.py
index 516715a..e08f6ba 100755
--- a/pyderasn.py
+++ b/pyderasn.py
@@ -4,7 +4,7 @@
 # pylint: disable=line-too-long,superfluous-parens,protected-access,too-many-lines
 # pylint: disable=too-many-return-statements,too-many-branches,too-many-statements
 # PyDERASN -- Python ASN.1 DER/CER/BER codec with abstract structures
-# Copyright (C) 2017-2020 Sergey Matveev <stargrave@stargrave.org>
+# Copyright (C) 2017-2021 Sergey Matveev <stargrave@stargrave.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as
@@ -17,9 +17,9 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program.  If not, see <http://www.gnu.org/licenses/>.
-"""Python ASN.1 DER/BER codec with abstract structures
+"""Python ASN.1 DER/CER/BER codec with abstract structures
 
-This library allows you to marshal various structures in ASN.1 DER
+This library allows you to marshal various structures in ASN.1 DER/CER
 format, unmarshal BER/CER/DER ones.
 
     >>> i = Integer(123)
@@ -355,6 +355,11 @@ Let's parse that output, human::
  (and its derivatives), ``SET``, ``SET OF``, ``UTCTime``, ``GeneralizedTime``
  could be BERed.
 
+Also it could be helpful to add quick ASN.1 pprinting command in your
+pdb's configuration file::
+
+    alias pp1 import pyderasn ;; print(pyderasn.pprint(%1, oid_maps=(locals().get("OID_STR_TO_NAME", {}),)))
+
 .. _definedby:
 
 DEFINED BY
@@ -765,7 +770,7 @@ forcefully encoded in DER during CER encoding, by specifying
 
     class SignedAttributes(SetOf):
         schema = Attribute()
-        bounds = (1, 32)
+        bounds = (1, float("+inf"))
         der_forced = True
 
 .. _agg_octet_string:
@@ -1170,8 +1175,6 @@ from datetime import datetime
 from datetime import timedelta
 from io import BytesIO
 from math import ceil
-from mmap import mmap
-from mmap import PROT_READ
 from operator import attrgetter
 from string import ascii_letters
 from string import digits
@@ -1201,7 +1204,7 @@ except ImportError:  # pragma: no cover
     def colored(what, *args, **kwargs):
         return what
 
-__version__ = "8.0"
+__version__ = "8.4"
 
 __all__ = (
     "agg_octet_string",
@@ -1292,8 +1295,13 @@ def file_mmaped(fd):
 
     :param fd: file object
     :returns: memoryview over read-only mmap-ing of the whole file
+
+    .. warning::
+
+       It is known to work under neither Python 2.x nor Windows.
     """
-    return memoryview(mmap(fd.fileno(), 0, prot=PROT_READ))
+    import mmap
+    return memoryview(mmap.mmap(fd.fileno(), length=0, prot=mmap.PROT_READ))
 
 
 def pureint(value):
@@ -7667,7 +7675,7 @@ def browse(raw, obj, oid_maps=()):
                 self._state_update()
             return super(TW, self).selectable()
 
-        def get_display_text(self):
+        def _get_display_text_without_offset(self):
             pp, constructed = self._get_pp()
             style = "constructed" if constructed else ""
             if len(pp.decode_path) == 0:
@@ -7685,6 +7693,11 @@ def browse(raw, obj, oid_maps=()):
                 ))
             return (style, ent)
 
+        def get_display_text(self):
+            pp, _ = self._get_pp()
+            style, ent = self._get_display_text_without_offset()
+            return [(style, ent), " [%d]" % pp.offset]
+
         def _scroll(self, what, step):
             self.state[what]._invalidate()
             pos = self.state[what].focus_position
@@ -7897,12 +7910,12 @@ def main():  # pragma: no cover
         help="Path to BER/CER/DER file you want to decode",
     )
     args = parser.parse_args()
-    if PY2:
+    try:
+        raw = file_mmaped(args.RAWFile)[args.skip:]
+    except:
         args.RAWFile.seek(args.skip)
         raw = memoryview(args.RAWFile.read())
         args.RAWFile.close()
-    else:
-        raw = file_mmaped(args.RAWFile)[args.skip:]
     oid_maps = (
         [obj_by_path(_path) for _path in (args.oids or "").split(",")]
         if args.oids else ()