diff options
| author | Legrandin <helderijs@gmail.com> | 2013-09-10 07:43:50 +0200 |
|---|---|---|
| committer | Dwayne Litzenberger <dlitz@dlitz.net> | 2013-10-20 13:30:21 -0700 |
| commit | 7214ce9929afeb98b1a54735d83881f4337cd8b8 (patch) | |
| tree | e463bb72235b9554b5302cee23e1f0dbf2303a73 /lib/Crypto/SelfTest/IO | |
| parent | 9a5faf9642660eab16d13d55ae539b41a711e5c9 (diff) | |
| download | pycrypto-7214ce9929afeb98b1a54735d83881f4337cd8b8.tar.gz | |
Removed most 'import *' statements
[dlitz@dlitz.net: Re-ordered commits; so don't import S2V yet]
[dlitz@dlitz.net: Included an additional 'import *' change from the following commit:]
commit 4ec64d8eaaa4965889eb8e3b801fc77aa84e0a4e
Author: Legrandin <helderijs@gmail.com>
Date: Tue Sep 10 07:28:08 2013 +0200
Removed last references to ApiUsageError
[dlitz@dlitz.net: Removed unrelated whitespace changes]
Diffstat (limited to 'lib/Crypto/SelfTest/IO')
| -rw-r--r-- | lib/Crypto/SelfTest/IO/test_PKCS8.py | 7 |
1 files changed, 3 insertions, 4 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) |