From 57f233eba1b502e065b26da5abd0c63ef60eb12c Mon Sep 17 00:00:00 2001 From: Legrandin Date: Sun, 21 Feb 2016 10:19:28 +0100 Subject: [PATCH] Use package 'Cryptodome' instead of 'Crypto' --- setup.py | 2 +- src/saml2/aes.py | 4 ++-- src/saml2/cert.py | 2 +- src/saml2/entity.py | 2 +- src/saml2/sigver.py | 18 +++++++++--------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/setup.py b/setup.py index f907e82..5497b8f 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ install_requires = [ 'paste', 'zope.interface', 'repoze.who', - 'pycryptodome', # 'Crypto' + 'pycryptodomex', 'pytz', 'pyOpenSSL', 'python-dateutil', diff --git a/src/saml2/aes.py b/src/saml2/aes.py index 4110e1f..f04f751 100644 --- a/src/saml2/aes.py +++ b/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' diff --git a/src/saml2/cert.py b/src/saml2/cert.py index 1a8d617..f71fd8e 100644 --- a/src/saml2/cert.py +++ b/src/saml2/cert.py @@ -8,7 +8,7 @@ import six 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 diff --git a/src/saml2/entity.py b/src/saml2/entity.py index 5367c51..4ab74c9 100644 --- a/src/saml2/entity.py +++ b/src/saml2/entity.py @@ -4,7 +4,7 @@ from binascii import hexlify 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 diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py index f67db59..a9cd748 100644 --- a/src/saml2/sigver.py +++ b/src/saml2/sigver.py @@ -18,15 +18,15 @@ from time import mktime 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