Code style improvements

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@462 96b47cad-a561-4643-ad3b-153ac7d7599c
2011-07-29 18:49:03 +00:00
parent 7ada4a0ca5
commit 9c7343ffd3
1 changed files with 9 additions and 10 deletions
--- a/virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py
+++ b/virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py
@@ -19,7 +19,7 @@
 import sys, binascii, utils, random
 from Crypto.Cipher import DES3, DES, AES, ARC4 #,IDEA no longer present in python-crypto?
 from struct import pack
-from binascii import b2a_hex
+from binascii import b2a_hex, a2b_hex
 from random import randint
 from virtualsmartcard.utils import inttostring, stringtoint, hexdump
 import string
@@ -539,7 +539,6 @@ def _makesalt():

 def test_pbkdf2():
    """Module self-test"""
-    from binascii import a2b_hex
    
    #
    # Test vectors from RFC 3962