From d8a1703c6d6de37f837ee3b9f549766cc098b528 Mon Sep 17 00:00:00 2001
From: oepen <oepen@96b47cad-a561-4643-ad3b-153ac7d7599c>
Date: Mon, 8 Aug 2011 12:20:31 +0000
Subject: [PATCH] The __replace_tag function was completely broken. It is now
 somewhat fixed, but should still be replaced by a more elegant solution.

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@483 96b47cad-a561-4643-ad3b-153ac7d7599c
---
 .../src/vpicc/virtualsmartcard/SEutils.py          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/virtualsmartcard/src/vpicc/virtualsmartcard/SEutils.py b/virtualsmartcard/src/vpicc/virtualsmartcard/SEutils.py
index 2c63a72..376fe9a 100644
--- a/virtualsmartcard/src/vpicc/virtualsmartcard/SEutils.py
+++ b/virtualsmartcard/src/vpicc/virtualsmartcard/SEutils.py
@@ -20,7 +20,7 @@ import TLVutils
 from time import time
 from random import seed, randint
 from virtualsmartcard.ConstantDefinitions import CRT_TEMPLATE, ALGO_MAPPING
-from virtualsmartcard.utils import inttostring
+from virtualsmartcard.utils import inttostring, stringtoint
 from virtualsmartcard.SWutils import SwError, SW
 
 class ControlReferenceTemplate:
@@ -81,10 +81,10 @@ class ControlReferenceTemplate:
         to support new or different algorithms.
         @param data: reference to an algorithm
         """
+        
         if not ALGO_MAPPING.has_key(data):
             raise SwError(SW["ERR_REFNOTUSABLE"]) 
         else:
-            #TODO: Sanity checking
             self.algorithm = ALGO_MAPPING[data]
             self.__replace_tag(0x80, data)
     
@@ -129,16 +129,16 @@ class ControlReferenceTemplate:
         """
         position = 0
         while self.__config_string[position:position+1] != tag and position < len(self.__config_string):    
-            length = inttostring(self.__config_string[position+1:position+2])
+            length = stringtoint(self.__config_string[position+1:position+2])
             position += length + 3
 
         if position < len(self.__config_string): #Replace Tag
-            length = inttostring(self.__config_string[position+1:position+2])
-            self.__config_string = self.__config_string[:position] + tag +\
-                                   inttostring(len(data)) + data +\
+            length = stringtoint(self.__config_string[position+1:position+2])
+            self.__config_string = self.__config_string[:position] +\
+                                   chr(tag) + inttostring(len(data)) + data +\
                                    self.__config_string[position+2+length:]
         else: #Add new tag
-            self.__config_string += tag + inttostring(len(data)) + data
+            self.__config_string += chr(tag) + inttostring(len(data)) + data
     
     def to_string(self):
         """