From 282043ed970e3ccfcca1abafbf9807db9cd36b13 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 3 Jul 2018 10:31:13 -0400 Subject: [PATCH] Switch to cryptodome Cryptodome is a modern, but compatible replacement for pycrypto. We may move to cryptography eventually, but start with this for now for some nice speedups in some cases. --- confluent_server/confluent/auth.py | 2 +- confluent_server/confluent/config/configmanager.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/confluent_server/confluent/auth.py b/confluent_server/confluent/auth.py index 85fc1b14..7ced4cdd 100644 --- a/confluent_server/confluent/auth.py +++ b/confluent_server/confluent/auth.py @@ -22,7 +22,7 @@ import confluent.config.configmanager as configmanager import eventlet import eventlet.tpool -import Crypto.Protocol.KDF as KDF +import Cryptodome.Protocol.KDF as KDF import hashlib import hmac import multiprocessing diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py index eb5c1348..47f58880 100644 --- a/confluent_server/confluent/config/configmanager.py +++ b/confluent_server/confluent/config/configmanager.py @@ -42,10 +42,10 @@ # by passphrase and optionally TPM -import Crypto.Protocol.KDF as KDF -from Crypto.Cipher import AES -from Crypto.Hash import HMAC -from Crypto.Hash import SHA256 +import Cryptodome.Protocol.KDF as KDF +from Cryptodome.Cipher import AES +from Cryptodome.Hash import HMAC +from Cryptodome.Hash import SHA256 import anydbm as dbm import ast import base64