diff --git a/confluent_server/confluent/auth.py b/confluent_server/confluent/auth.py index ce8cfd49..b71dbb6d 100644 --- a/confluent_server/confluent/auth.py +++ b/confluent_server/confluent/auth.py @@ -22,7 +22,10 @@ import confluent.config.configmanager as configmanager import eventlet import eventlet.tpool -import Cryptodome.Protocol.KDF as KDF +try: + import Cryptodome.Protocol.KDF as KDF +except ImportError: + import Crypto.Protocol.KDF as KDF from fnmatch import fnmatch import hashlib import hmac diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py index 91f48ffc..58f4bc59 100644 --- a/confluent_server/confluent/config/configmanager.py +++ b/confluent_server/confluent/config/configmanager.py @@ -42,10 +42,16 @@ # by passphrase and optionally TPM -import Cryptodome.Protocol.KDF as KDF -from Cryptodome.Cipher import AES -from Cryptodome.Hash import HMAC -from Cryptodome.Hash import SHA256 +try: + import Cryptodome.Protocol.KDF as KDF + from Cryptodome.Cipher import AES + from Cryptodome.Hash import HMAC + from Cryptodome.Hash import SHA256 +except ImportError: + import Crypto.Protocol.KDF as KDF + from Crypto.Cipher import AES + from Crypto.Hash import HMAC + from Crypto.Hash import SHA256 try: import anydbm as dbm except ModuleNotFoundError: