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

Fix storage and retrieval of Security Environments

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@486 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
oepen
2011-08-08 15:17:06 +00:00
parent 414903481c
commit 90bffcf039
2 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
virtualsmartcard/src/vpicc/virtualsmartcard/SEutils.py
View File

@@ -73,6 +73,10 @@ class ControlReferenceTemplate:
self.__set_iv(tag, length, value) self.__set_iv(tag, length, value)
elif tag == 0x95: elif tag == 0x95:
self.usage_qualifier = value self.usage_qualifier = value
else:
raise SwError(SW["ERR_REFNOTUSABLE"])
return SW["NORMAL"], ""
def __set_algo(self, data): def __set_algo(self, data):
""" """
@@ -87,7 +91,6 @@ class ControlReferenceTemplate:
else: else:
self.algorithm = ALGO_MAPPING[data] self.algorithm = ALGO_MAPPING[data]
self.__replace_tag(0x80, data) self.__replace_tag(0x80, data)
return SW["NORMAL"], ""
def __set_key(self, tag, value): def __set_key(self, tag, value):
if tag == 0x81: if tag == 0x81:

56
virtualsmartcard/src/vpicc/virtualsmartcard/SmartcardSAM.py
View File

@@ -451,6 +451,10 @@ class Secure_Messaging(object):
def __init__(self, MF, SAM, SE=None): def __init__(self, MF, SAM, SE=None):
self.mf = MF self.mf = MF
self.sam = SAM self.sam = SAM
#Security Environments may be saved and retrieved from/to this dictionary
self.saved_SEs = {}
if not SE: if not SE:
self.current_SE = Security_Environment() self.current_SE = Security_Environment()
else: else:
@@ -495,17 +499,16 @@ class Secure_Messaging(object):
#Verification, encipherment, external authentication and key agreement #Verification, encipherment, external authentication and key agreement
if se & 0x08: if se & 0x08:
self.current_SE.external_auth = True self.current_SE.external_auth = True
self.__set_SE(p2, data) return self.__set_SE(p2, data)
elif(cmd== 0x02): elif(cmd== 0x02):
self.__store_SE(p2) return self.__store_SE(p2)
elif(cmd == 0x03): elif(cmd == 0x03):
self.__restore_SE(p2) return self.__restore_SE(p2)
elif(cmd == 0x04): elif(cmd == 0x04):
self.__erase_SE(p2) return self.__erase_SE(p2)
else: else:
raise SwError(SW["ERR_INCORRECTP1P2"]) raise SwError(SW["ERR_INCORRECTP1P2"])
return SW["NORMAL"], ""
def __set_SE(self, p2, data): def __set_SE(self, p2, data):
""" """
@@ -517,17 +520,17 @@ class Secure_Messaging(object):
if not p2 in valid_p2: if not p2 in valid_p2:
raise SwError(SW["ERR_INCORRECTP1P2"]) raise SwError(SW["ERR_INCORRECTP1P2"])
if p2 == 0xA4: if p2 == 0xA4:
self.current_SE.at.parse_SE_config(data) return self.current_SE.at.parse_SE_config(data)
elif p2 == 0xA6: elif p2 == 0xA6:
self.current_SE.kat.parse_SE_config(data) return self.current_SE.kat.parse_SE_config(data)
elif p2 == 0xAA: elif p2 == 0xAA:
self.current_SE.ht.parse_SE_config(data) return self.current_SE.ht.parse_SE_config(data)
elif p2 == 0xB4: elif p2 == 0xB4:
self.current_SE.cct.parse_SE_config(data) return self.current_SE.cct.parse_SE_config(data)
elif p2 == 0xB6: elif p2 == 0xB6:
self.current_SE.dst.parse_SE_config(data) return self.current_SE.dst.parse_SE_config(data)
elif p2 == 0xB8: elif p2 == 0xB8:
self.current_SE.ct.parse_SE_config(data) return self.current_SE.ct.parse_SE_config(data)
def __store_SE(self, SEID): def __store_SE(self, SEID):
""" """
@@ -535,29 +538,38 @@ class Secure_Messaging(object):
SEID is used as a reference to identify the SE. SEID is used as a reference to identify the SE.
""" """
SEstr = dumps(self.current_SE) SEstr = dumps(self.current_SE)
try: self.saved_SEs[SEID] = SEstr
self.sam.addkey(SEID, SEstr) #FIXME: Need SAM reference return SW["NORMAL"], ""
except ValueError:
raise SwError["ERR_INCORRECTP1P2"]
def __restore_SE(self, SEID): def __restore_SE(self, SEID):
""" """
Restores a Security Environment from the SAM and replaces the current SE Restores a Security Environment from the SAM and replaces the current SE
with it with it
""" """
SEstr = self.sam.get_key(SEID)
SE = loads(SEstr) if (not self.saved_SEs.has_key(SEID)):
if isinstance(SE, Security_Environment):
self.current_SE = SE
else:
raise SwError(SW["ERR_REFNOTUSABLE"]) raise SwError(SW["ERR_REFNOTUSABLE"])
else:
SEstr = self.saved_SEs[SEID]
SE = loads(SEstr)
if isinstance(SE, Security_Environment):
self.current_SE = SE
else:
raise SwError(SW["ERR_REFNOTUSABLE"])
return SW["NORMAL"], ""
def __erase_SE(self, SEID): def __erase_SE(self, SEID):
""" """
Erases a Security Environment stored under SEID from the SAM Erases a Security Environment stored under SEID from the SAM
""" """
self.sam.removeKey(SEID) if (not self.saved_SEs.has_key(SEID)):
raise SwError(SW["ERR_REFNOTUSABLE"])
else:
del self.saved_SEs[SEID]
return SW["NORMAL"], ""
def parse_SM_CAPDU(self, CAPDU, header_authentication): def parse_SM_CAPDU(self, CAPDU, header_authentication):
""" """