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

fixed generation of ePass file system (fixes 3164830)

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@393 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2011-01-25 12:53:26 +00:00
parent 2cd4899a42
commit 8ab0ea2eb3
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
virtualsmartcard/src/vpicc/virtualsmartcard/CardGenerator.py
View File

@@ -81,22 +81,18 @@ class CardGenerator(object):
mf = MF()
#We need a MF with Application DF \xa0\x00\x00\x02G\x10\x01
mf.append(DF(parent=mf, fid=4, dfname='\xa0\x00\x00\x02G\x10\x01', bertlv_data=[]))
df = mf.currentDF()
mf.append(TransparentStructureEF(parent=df, fid=0x011E, filedescriptor=0, data=""))#EF.COM
mf.append(TransparentStructureEF(parent=df, fid=0x0101, filedescriptor=0, data=""))#EF.DG1
mf.append(TransparentStructureEF(parent=df, fid=0x0102, filedescriptor=0, data=""))#EF.DG2
mf.append(TransparentStructureEF(parent=df, fid=0x010D, filedescriptor=0, data=""))#EF.SOD
df = DF(parent=mf, fid=4, dfname='\xa0\x00\x00\x02G\x10\x01', bertlv_data=[])
#EF.COM
COM = pack([(0x5F01,4,"0107"),(0x5F36,6,"040000"),(0x5C,2,"6175")])
COM = pack(((0x60,len(COM),COM),))
fid = df.select("fid",0x011E)
fid.writebinary([0],[COM])
df.append(TransparentStructureEF(parent=df, fid=0x011E, filedescriptor=0, data=COM))
#EF.DG1
DG1 = pack([(0x5F1F,len(MRZ),MRZ)])
DG1 = pack([(0x61,len(DG1),DG1)])
fid = df.select("fid",0x0101)
fid.writebinary([0],[DG1])
df.append(TransparentStructureEF(parent=df, fid=0x0101, filedescriptor=0, data=DG1))
#EF.DG2
if picture != None:
IIB = "\x00\x01" + inttostring(pic_width,2) + inttostring(pic_height,2) + 6 * "\x00"
@@ -107,9 +103,15 @@ class CardGenerator(object):
DG2 = pack([(0xA1,8,"\x87\x02\x01\x01\x88\x02\x05\x01"),(0x5F2E,len(picture),picture)])
DG2 = pack([(0x02,1,"\x01"),(0x7F60,len(DG2),DG2)])
DG2 = pack([(0x7F61,len(DG2),DG2)])
fid = df.select("fid",0x0102)
fid.writebinary([0],[DG2])
else:
DG2=""
df.append(TransparentStructureEF(parent=df, fid=0x0102, filedescriptor=0, data=DG2))
#EF.SOD
df.append(TransparentStructureEF(parent=df, fid=0x010D, filedescriptor=0, data=""))
mf.append(df)
self.mf = mf
self.sam = PassportSAM(self.mf)

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

@@ -45,7 +45,7 @@ def walk(start, path): # {{{
if len(path) % 2 != 0:
raise SwError(SW["ERR_INCORRECTPARAMETERS"])
index = 0
while index + 2 < len(path):
while index + 2 <= len(path):
if not isinstance(start, DF):
# File or application not found
raise SwError(SW["ERR_FILENOTFOUND"])

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

@@ -413,8 +413,8 @@ class SAM(object):
class PassportSAM(SAM):
def __init__(self, mf):
df = mf.currentDF()
ef_dg1 = df.select("fid", 0x0101)
ef_dg1 = virtualsmartcard.SmartcardFilesystem.walk(mf, "\x00\x04\x01\x01")
dg1 = ef_dg1.readbinary(5)
self.mrz1 = dg1[:43]
self.mrz2 = dg1[44:]