Switch to using pycryptodome instead of pycrypto

pycrypto is not being maintained, and pycryptodome is theoretically a
drop-in replacement (in practice, it seems it was close)

6 files changed, 12 insertions, 12 deletions

diff --git a/postgresqleu/auth.py b/postgresqleu/auth.py
index e8daa0ba..f90b1b13 100644
--- a/postgresqleu/auth.py
+++ b/postgresqleu/auth.py
@@ -30,9 +30,9 @@ import json
 import socket
 from urllib.parse import urlparse, urlencode, parse_qs
 import requests
-from Crypto.Cipher import AES
-from Crypto.Hash import SHA
-from Crypto import Random
+from Cryptodome.Cipher import AES
+from Cryptodome.Hash import SHA
+from Cryptodome import Random
 import time
 
 
@@ -58,7 +58,7 @@ def login(request):
         r = Random.new()
         iv = r.read(16)
         encryptor = AES.new(SHA.new(settings.SECRET_KEY.encode('ascii')).digest()[:16], AES.MODE_CBC, iv)
-        cipher = encryptor.encrypt(s + ' ' * (16 - (len(s) % 16)))  # pad to 16 bytes
+        cipher = encryptor.encrypt(s.encode('ascii') + b' ' * (16 - (len(s) % 16)))  # pad to 16 bytes
 
         return HttpResponseRedirect("%s?d=%s$%s" % (
             settings.PGAUTH_REDIRECT,
diff --git a/postgresqleu/confreg/jinjafunc.py b/postgresqleu/confreg/jinjafunc.py
index 2b931f6b..e6b20ff2 100644
--- a/postgresqleu/confreg/jinjafunc.py
+++ b/postgresqleu/confreg/jinjafunc.py
@@ -14,7 +14,7 @@ from itertools import groupby
 from datetime import datetime, date, time
 import dateutil.parser
 import textwrap
-from Crypto.Hash import SHA
+from Cryptodome.Hash import SHA
 
 from postgresqleu.util.context_processors import settings_context
 
diff --git a/postgresqleu/confreg/views.py b/postgresqleu/confreg/views.py
index a0bb6140..38fcf54e 100644
--- a/postgresqleu/confreg/views.py
+++ b/postgresqleu/confreg/views.py
@@ -73,7 +73,7 @@ import base64
 import re
 import os
 from email.mime.text import MIMEText
-from Crypto.Hash import SHA256
+from Cryptodome.Hash import SHA256
 from io import StringIO
 import xml.etree.ElementTree as ET
 
diff --git a/postgresqleu/trustlypayment/api.py b/postgresqleu/trustlypayment/api.py
index c5669f63..24bed615 100644
--- a/postgresqleu/trustlypayment/api.py
+++ b/postgresqleu/trustlypayment/api.py
@@ -3,9 +3,9 @@ from uuid import uuid4
 from time import time
 from datetime import timedelta
 from decimal import Decimal
-from Crypto.Signature import PKCS1_v1_5
-from Crypto.Hash import SHA
-from Crypto.PublicKey import RSA
+from Cryptodome.Signature import PKCS1_v1_5
+from Cryptodome.Hash import SHA
+from Cryptodome.PublicKey import RSA
 import base64
 import requests
 
diff --git a/postgresqleu/util/payment/trustly.py b/postgresqleu/util/payment/trustly.py
index 8fb42917..5dd0fd6d 100644
--- a/postgresqleu/util/payment/trustly.py
+++ b/postgresqleu/util/payment/trustly.py
@@ -16,7 +16,7 @@ from postgresqleu.trustlypayment.api import TrustlyException
 from . import BasePayment
 
 import collections
-from Crypto.PublicKey import RSA
+from Cryptodome.PublicKey import RSA
 
 
 def validate_pem_public_key(value):
diff --git a/postgresqleu/util/random.py b/postgresqleu/util/random.py
index 427da458..4006ce92 100644
--- a/postgresqleu/util/random.py
+++ b/postgresqleu/util/random.py
@@ -1,5 +1,5 @@
-from Crypto.Hash import SHA256
-from Crypto import Random
+from Cryptodome.Hash import SHA256
+from Cryptodome import Random
 
 
 def generate_random_token():