From 3f74291dc213ddd062c0abd19bdc2b6a76a5e5d6 Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Mon, 18 May 2015 08:43:37 +0200 Subject: [PATCH] fixed pycrypto import fixes regression from bca53f92f18a5e41fdfcf86281b37f60d90b8c5a --- virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py b/virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py index aac9901..f4a1009 100644 --- a/virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py +++ b/virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py @@ -25,6 +25,7 @@ import string, re try: # Use PyCrypto (if available) + from Crypto.Cipher import DES3, DES, AES, ARC4#@UnusedImport from Crypto.Hash import HMAC, SHA as SHA1 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 """ - from Crypto.Cipher import DES3 cipher = DES3.new(session_key, DES3.MODE_CBC, iv) padded = append_padding(8, message, 0x01) block_count = len(padded) / cipher.block_size