From e33544452f03c9c1821b705f09f5979e22db4a31 Mon Sep 17 00:00:00 2001
From: oepen <oepen@96b47cad-a561-4643-ad3b-153ac7d7599c>
Date: Mon, 1 Aug 2011 12:59:25 +0000
Subject: [PATCH] Bugfixes: Wrong number of arguments for function call and
 missing import

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@474 96b47cad-a561-4643-ad3b-153ac7d7599c
---
 virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py | 2 +-
 virtualsmartcard/src/vpicc/virtualsmartcard/TLVutils.py    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py b/virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py
index 4f4d8b4..88c3742 100644
--- a/virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py
+++ b/virtualsmartcard/src/vpicc/virtualsmartcard/CryptoUtils.py
@@ -124,7 +124,7 @@ def crypto_checksum(algo, key, data, iv=None, ssc=None):
         raise ValueError, "Unknown Algorithm %s" % algo
     
     if algo == "MAC":
-        checksum = calculate_MAC(key, data, 0x00, iv) #FIXME: IV?
+        checksum = calculate_MAC(key, data, iv)
     elif algo == "HMAC":
         hmac = HMAC.new(key, data)
         checksum = hmac.hexdigest()
diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard/TLVutils.py b/virtualsmartcard/src/vpicc/virtualsmartcard/TLVutils.py
index 054bd57..3604e1c 100644
--- a/virtualsmartcard/src/vpicc/virtualsmartcard/TLVutils.py
+++ b/virtualsmartcard/src/vpicc/virtualsmartcard/TLVutils.py
@@ -16,6 +16,9 @@
 # You should have received a copy of the GNU General Public License along with
 # virtualsmartcard.  If not, see <http://www.gnu.org/licenses/>.
 #
+
+from vsmartcard.utils import stringtoint
+
 TAG = {}
 TAG["FILECONTROLPARAMETERS"]    = 0x62
 TAG["FILEMANAGEMENTDATA"]       = 0x64