VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Code style improvements

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@462 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
oepen
2011-07-29 18:49:03 +00:00
parent 7ada4a0ca5
commit 9c7343ffd3
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py
View File

@@ -19,7 +19,7 @@
import sys, binascii, utils, random import sys, binascii, utils, random
from Crypto.Cipher import DES3, DES, AES, ARC4 #,IDEA no longer present in python-crypto? from Crypto.Cipher import DES3, DES, AES, ARC4 #,IDEA no longer present in python-crypto?
from struct import pack from struct import pack
from binascii import b2a_hex from binascii import b2a_hex, a2b_hex
from random import randint from random import randint
from virtualsmartcard.utils import inttostring, stringtoint, hexdump from virtualsmartcard.utils import inttostring, stringtoint, hexdump
import string import string
@@ -79,7 +79,7 @@ def get_cipher_keylen(cipherspec):
elif cipher == "DES3": elif cipher == "DES3":
return 16 return 16
else: else:
raise ValueError, "Unsupported Encryption Algorithm: " + cipher raise ValueError, "Unsupported Encryption Algorithm: " + cipher
def get_cipher_blocklen(cipherspec): def get_cipher_blocklen(cipherspec):
cipherparts = cipherspec.split("-") cipherparts = cipherspec.split("-")
@@ -108,7 +108,7 @@ def append_padding(cipherspec, data, padding_class=0x01):
return data + padding return data + padding
def strip_padding(cipherspec,data,padding_class=0x01): def strip_padding(cipherspec, data, padding_class=0x01):
""" """
Strip the padding of decrypted data. Returns data without padding Strip the padding of decrypted data. Returns data without padding
""" """
@@ -121,13 +121,13 @@ def strip_padding(cipherspec,data,padding_class=0x01):
return data[:tail] return data[:tail]
def crypto_checksum(algo, key, data, iv=None, ssc=None): def crypto_checksum(algo, key, data, iv=None, ssc=None):
if algo not in ("HMAC","MAC","CC"): if algo not in ("HMAC", "MAC", "CC"):
raise ValueError, "Unknown Algorithm %s" % algo raise ValueError, "Unknown Algorithm %s" % algo
if algo == "MAC": if algo == "MAC":
checksum = calculate_MAC(key,data,0x00,iv) #FIXME: IV? checksum = calculate_MAC(key, data, 0x00, iv) #FIXME: IV?
elif algo == "HMAC": elif algo == "HMAC":
hmac = HMAC.new(key,data) hmac = HMAC.new(key, data)
checksum = hmac.hexdigest() checksum = hmac.hexdigest()
del hmac del hmac
elif algo == "CC": elif algo == "CC":
@@ -162,7 +162,7 @@ def encrypt(cipherspec, key, data, iv = None):
def decrypt(cipherspec, key, data, iv = None): def decrypt(cipherspec, key, data, iv = None):
return cipher(False, cipherspec, key, data, iv) return cipher(False, cipherspec, key, data, iv)
def hash(hashmethod,data): def hash(hashmethod, data):
from Crypto.Hash import SHA, MD5#, RIPEMD from Crypto.Hash import SHA, MD5#, RIPEMD
hash_class = locals().get(hashmethod.upper(), None) hash_class = locals().get(hashmethod.upper(), None)
if hash_class == None: if hash_class == None:
@@ -177,7 +177,7 @@ def operation_on_string(string1, string2, op):
raise ValueError, "string1 and string2 must be of equal length" raise ValueError, "string1 and string2 must be of equal length"
result = [] result = []
for i in range(len(string1)): for i in range(len(string1)):
result.append( chr(op(ord(string1[i]),ord(string2[i]))) ) result.append(chr(op(ord(string1[i]), ord(string2[i]))))
return "".join(result) return "".join(result)
def protect_string(string, password, cipherspec=None): def protect_string(string, password, cipherspec=None):
@@ -277,7 +277,7 @@ def get_session_key(auth_key, host_challenge, card_challenge):
def generate_host_challenge(): def generate_host_challenge():
random.seed() random.seed()
return "".join([chr(random.randint(0,255)) for e in range(8)]) return "".join([chr(random.randint(0, 255)) for e in range(8)])
def andstring(string1, string2): def andstring(string1, string2):
return operation_on_string(string1, string2, lambda a,b: a & b) return operation_on_string(string1, string2, lambda a,b: a & b)
@@ -539,7 +539,6 @@ def _makesalt():
def test_pbkdf2(): def test_pbkdf2():
"""Module self-test""" """Module self-test"""
from binascii import a2b_hex
# #
# Test vectors from RFC 3962 # Test vectors from RFC 3962