diff options
author | NoDRM <[email protected]> | 2022-03-19 10:14:45 +0100 |
---|---|---|
committer | NoDRM <[email protected]> | 2022-03-19 10:14:45 +0100 |
commit | b283777c0a429e5f0ec322e5c27d0579ca96dcbb (patch) | |
tree | 1ed7449aedaac6877b1db1a431900255468ec024 /Obok_plugin | |
parent | cf095a4171efd3414124965d577777471f0baaf4 (diff) |
Add back unpad to fix Python2 support
Diffstat (limited to 'Obok_plugin')
-rw-r--r-- | Obok_plugin/obok/obok.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Obok_plugin/obok/obok.py b/Obok_plugin/obok/obok.py index e95e8d1..e7da430 100644 --- a/Obok_plugin/obok/obok.py +++ b/Obok_plugin/obok/obok.py @@ -166,7 +166,7 @@ from __future__ import print_function __version__ = '10.0.1' -__about__ = "Obok v{0}\nCopyright © 2012-2020 Physisticated et al.".format(__version__) +__about__ = "Obok v{0}\nCopyright © 2012-2022 Physisticated et al.".format(__version__) import sys import os @@ -185,10 +185,17 @@ import tempfile try: from Cryptodome.Cipher import AES - from Cryptodome.Util.Padding import unpad except ImportError: from Crypto.Cipher import AES - from Crypto.Util.Padding import unpad + +def unpad(data, padding=16): + if sys.version_info[0] == 2: + pad_len = ord(data[-1]) + else: + pad_len = data[-1] + + return data[:-pad_len] + can_parse_xml = True try: |