diff options
-rw-r--r-- | lib/Crypto/SelfTest/IO/test_PKCS8.py | 7 | ||||
-rw-r--r-- | lib/Crypto/SelfTest/Protocol/test_KDF.py | 4 | ||||
-rw-r--r-- | lib/Crypto/SelfTest/PublicKey/test_ElGamal.py | 2 | ||||
-rw-r--r-- | lib/Crypto/SelfTest/Signature/test_pkcs1_15.py | 3 | ||||
-rw-r--r-- | lib/Crypto/SelfTest/Signature/test_pkcs1_pss.py | 3 | ||||
-rw-r--r-- | lib/Crypto/SelfTest/Util/test_Padding.py | 2 | ||||
-rw-r--r-- | lib/Crypto/SelfTest/Util/test_asn1.py | 6 |
7 files changed, 17 insertions, 10 deletions
diff --git a/lib/Crypto/SelfTest/IO/test_PKCS8.py b/lib/Crypto/SelfTest/IO/test_PKCS8.py index 09d3554..6902ab4 100644 --- a/lib/Crypto/SelfTest/IO/test_PKCS8.py +++ b/lib/Crypto/SelfTest/IO/test_PKCS8.py @@ -26,15 +26,14 @@ __revision__ = "$Id$" import unittest import sys +from binascii import unhexlify from Crypto.Util.py3compat import * -from Crypto.Util.asn1 import * -from Crypto.IO import PKCS8 -from binascii import * - if sys.version_info[0] == 2 and sys.version_info[1] == 1: from Crypto.Util.py21compat import * +from Crypto.IO import PKCS8 + oid_key = '1.2.840.113549.1.1.1' # Original RSA key (in DER format) diff --git a/lib/Crypto/SelfTest/Protocol/test_KDF.py b/lib/Crypto/SelfTest/Protocol/test_KDF.py index 741c4ce..75bb8f2 100644 --- a/lib/Crypto/SelfTest/Protocol/test_KDF.py +++ b/lib/Crypto/SelfTest/Protocol/test_KDF.py @@ -25,10 +25,12 @@ __revision__ = "$Id$" import unittest from binascii import unhexlify +from Crypto.Util.py3compat import * + from Crypto.SelfTest.st_common import list_test_cases from Crypto.Hash import SHA1, HMAC -from Crypto.Protocol.KDF import * +from Crypto.Protocol.KDF import PBKDF1, PBKDF2 def t2b(t): return unhexlify(b(t)) diff --git a/lib/Crypto/SelfTest/PublicKey/test_ElGamal.py b/lib/Crypto/SelfTest/PublicKey/test_ElGamal.py index 0c76792..5f33c23 100644 --- a/lib/Crypto/SelfTest/PublicKey/test_ElGamal.py +++ b/lib/Crypto/SelfTest/PublicKey/test_ElGamal.py @@ -28,7 +28,7 @@ import unittest from Crypto.SelfTest.st_common import list_test_cases, a2b_hex, b2a_hex from Crypto import Random from Crypto.PublicKey import ElGamal -from Crypto.Util.number import * +from Crypto.Util.number import bytes_to_long from Crypto.Util.py3compat import * class ElGamalTest(unittest.TestCase): diff --git a/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py b/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py index 976eb97..cc94262 100644 --- a/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py +++ b/lib/Crypto/SelfTest/Signature/test_pkcs1_15.py @@ -26,7 +26,8 @@ import unittest from Crypto.PublicKey import RSA from Crypto.SelfTest.st_common import list_test_cases, a2b_hex, b2a_hex -from Crypto.Hash import * +from Crypto.Hash import MD2, SHA1, MD5, SHA224, SHA256, SHA384, SHA512,\ + RIPEMD160 from Crypto import Random from Crypto.Signature import PKCS1_v1_5 as PKCS from Crypto.Util.py3compat import * diff --git a/lib/Crypto/SelfTest/Signature/test_pkcs1_pss.py b/lib/Crypto/SelfTest/Signature/test_pkcs1_pss.py index d8ddda3..e37e7a1 100644 --- a/lib/Crypto/SelfTest/Signature/test_pkcs1_pss.py +++ b/lib/Crypto/SelfTest/Signature/test_pkcs1_pss.py @@ -29,7 +29,8 @@ import unittest from Crypto.PublicKey import RSA from Crypto import Random from Crypto.SelfTest.st_common import list_test_cases, a2b_hex, b2a_hex -from Crypto.Hash import * +from Crypto.Hash import SHA1, MD2, RIPEMD160, SHA224, SHA384, SHA512,\ + SHA256, MD5 from Crypto.Signature import PKCS1_PSS as PKCS from Crypto.Util.py3compat import * diff --git a/lib/Crypto/SelfTest/Util/test_Padding.py b/lib/Crypto/SelfTest/Util/test_Padding.py index 5a3d199..b8a01ab 100644 --- a/lib/Crypto/SelfTest/Util/test_Padding.py +++ b/lib/Crypto/SelfTest/Util/test_Padding.py @@ -25,7 +25,7 @@ from binascii import unhexlify as uh from Crypto.Util.py3compat import * from Crypto.SelfTest.st_common import list_test_cases -from Crypto.Util.Padding import * +from Crypto.Util.Padding import pad, unpad class PKCS7_Tests(unittest.TestCase): diff --git a/lib/Crypto/SelfTest/Util/test_asn1.py b/lib/Crypto/SelfTest/Util/test_asn1.py index 0986c70..e40a46f 100644 --- a/lib/Crypto/SelfTest/Util/test_asn1.py +++ b/lib/Crypto/SelfTest/Util/test_asn1.py @@ -28,7 +28,11 @@ import unittest import sys from Crypto.Util.py3compat import * -from Crypto.Util.asn1 import * +from Crypto.Util.asn1 import DerObject, DerSetOf, newDerSetOf, DerInteger,\ + DerBitString, newDerBitString, newDerObjectId,\ + DerObjectId, DerNull, DerOctetString,\ + newDerOctetString, DerSequence, newDerSequence,\ + newDerInteger if sys.version_info[0] == 2 and sys.version_info[1] == 1: from Crypto.Util.py21compat import * |