Merge pull request #317 from Legrandin/pycryptodomex

Use package 'Cryptodome' instead of 'Crypto'

Author: Roland Hedberg

setup.py

@@ -13,7 +13,7 @@
     'paste',
     'zope.interface',
     'repoze.who',
-    'pycryptodome',  # 'Crypto'
+    'pycryptodomex',
     'pytz',
     'pyOpenSSL',
     'python-dateutil',

src/saml2/aes.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import os
-from Crypto import Random
-from Crypto.Cipher import AES
+from Cryptodome import Random
+from Cryptodome.Cipher import AES
 from base64 import b64encode, b64decode
 
 __author__ = 'rolandh'

src/saml2/cert.py

@@ -8,7 +8,7 @@
 from OpenSSL import crypto
 from os.path import join
 from os import remove
-from Crypto.Util import asn1
+from Cryptodome.Util import asn1
 
 class WrongInput(Exception):
     pass

src/saml2/entity.py

@@ -4,7 +4,7 @@
 import copy
 import logging
 from hashlib import sha1
-from Crypto.PublicKey import RSA
+from Cryptodome.PublicKey import RSA
 import requests
 import six
 from saml2.metadata import ENDPOINTS

src/saml2/sigver.py

@@ -18,15 +18,15 @@
 from binascii import hexlify
 import six
 
-from Crypto.PublicKey.RSA import importKey
-from Crypto.Signature import PKCS1_v1_5
-from Crypto.Util.asn1 import DerSequence
-from Crypto.PublicKey import RSA
-from Crypto.Hash import SHA
-from Crypto.Hash import SHA224
-from Crypto.Hash import SHA256
-from Crypto.Hash import SHA384
-from Crypto.Hash import SHA512
+from Cryptodome.PublicKey.RSA import importKey
+from Cryptodome.Signature import PKCS1_v1_5
+from Cryptodome.Util.asn1 import DerSequence
+from Cryptodome.PublicKey import RSA
+from Cryptodome.Hash import SHA
+from Cryptodome.Hash import SHA224
+from Cryptodome.Hash import SHA256
+from Cryptodome.Hash import SHA384
+from Cryptodome.Hash import SHA512
 
 from tempfile import NamedTemporaryFile
 from subprocess import Popen