From c7459f92184780931bdae04cba0e4cdccff8c449 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Tue, 9 Apr 2019 19:35:16 +0200 Subject: [PATCH] zerobin: Fix imports to work with the mainstream Cryptodome library https://pycryptodome.readthedocs.io/ uses the Crypto namespace https://pypi.org/project/pycryptodomex/ is a fork of Cryptodome that uses the Cryptodome namespace. Some distributions went with pycryptodomex, others with pycryptodome. --- modules/zerobin/crypto.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/zerobin/crypto.py b/modules/zerobin/crypto.py index 9292af46b2..5cb45b4306 100644 --- a/modules/zerobin/crypto.py +++ b/modules/zerobin/crypto.py @@ -22,10 +22,16 @@ import math from os import urandom -from Cryptodome.Cipher import AES -from Cryptodome.Protocol.KDF import PBKDF2 -from Cryptodome.Hash import SHA256 -from Cryptodome.Hash import HMAC +try: + from Cryptodome.Cipher import AES + from Cryptodome.Protocol.KDF import PBKDF2 + from Cryptodome.Hash import SHA256 + from Cryptodome.Hash import HMAC +except ImportError: + from Crypto.Cipher import AES + from Crypto.Protocol.KDF import PBKDF2 + from Crypto.Hash import SHA256 + from Crypto.Hash import HMAC def log2(n): -- GitLab