From 0fc5a97113a45117a5ff4e52e86f8a247c3eaed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20NO=C3=8BL?= <tnoel@entrouvert.com>
Date: Wed, 27 Nov 2019 23:24:00 +0100
Subject: [PATCH] crypto: use pycrytodomex, replace Crypto with Cryptodome
 (#38017)

mainly because Debian python-cryptodome package use pycrytodomex, which
is a library independent of the old PyCrypto, available under the
Cryptodome name.
---
 setup.py                 |  2 +-
 src/authentic2/crypto.py | 10 +++++-----
 tests/test_crypto.py     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/setup.py b/setup.py
index ce62d08ac..f428eecd7 100755
--- a/setup.py
+++ b/setup.py
@@ -129,7 +129,7 @@ setup(name="authentic2",
           'Markdown>=2.1',
           'python-ldap',
           'django-filter>1,<2',
-          'pycryptodome',
+          'pycryptodomex',
           'django-mellon',
           'ldaptools',
           'jwcrypto>=0.3.1,<1',
diff --git a/src/authentic2/crypto.py b/src/authentic2/crypto.py
index affa5cc33..4c781624d 100644
--- a/src/authentic2/crypto.py
+++ b/src/authentic2/crypto.py
@@ -19,11 +19,11 @@ import hashlib
 import hmac
 import struct
 
-from Crypto.Cipher import AES
-from Crypto.Protocol.KDF import PBKDF2
-from Crypto.Hash import SHA256
-from Crypto.Hash import HMAC
-from Crypto import Random
+from Cryptodome.Cipher import AES
+from Cryptodome.Protocol.KDF import PBKDF2
+from Cryptodome.Hash import SHA256
+from Cryptodome.Hash import HMAC
+from Cryptodome import Random
 
 from django.utils.crypto import constant_time_compare
 from django.utils.encoding import force_bytes
diff --git a/tests/test_crypto.py b/tests/test_crypto.py
index ba7a08123..48091c949 100644
--- a/tests/test_crypto.py
+++ b/tests/test_crypto.py
@@ -41,7 +41,7 @@ def test_exceptions():
 
 
 def test_padding():
-    from Crypto import Random
+    from Cryptodome import Random
 
     for i in range(1, 100):
         for j in range(2, 32):