Use package 'Cryptodome' instead of 'Crypto'

This commit is contained in:
Legrandin
2016-02-21 10:19:28 +01:00
parent 24f141c99f
commit 57f233eba1
5 changed files with 14 additions and 14 deletions

View File

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

View File

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

View File

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

View File

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

View File

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