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

fixed pycrypto import

Browse Source 
fixes regression from bca53f92f1
This commit is contained in:
Frank Morgner
2015-05-18 08:43:37 +02:00
parent bca53f92f1
commit 3f74291dc2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import string, re
try: try:
# Use PyCrypto (if available) # Use PyCrypto (if available)
from Crypto.Cipher import DES3, DES, AES, ARC4#@UnusedImport
from Crypto.Hash import HMAC, SHA as SHA1 from Crypto.Hash import HMAC, SHA as SHA1
except ImportError: except ImportError:
@@ -263,7 +264,6 @@ def calculate_MAC(session_key, message, iv=CYBERFLEX_IV):
Cyberflex MAC is the last Block of the input encrypted with DES3-CBC Cyberflex MAC is the last Block of the input encrypted with DES3-CBC
""" """
from Crypto.Cipher import DES3
cipher = DES3.new(session_key, DES3.MODE_CBC, iv) cipher = DES3.new(session_key, DES3.MODE_CBC, iv)
padded = append_padding(8, message, 0x01) padded = append_padding(8, message, 0x01)
block_count = len(padded) / cipher.block_size block_count = len(padded) / cipher.block_size