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

More cleanup

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@509 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
oepen
2011-08-23 15:06:50 +00:00
parent d467c204c5
commit 159dd0920a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,7 @@ from virtualsmartcard.utils import inttostring
from virtualsmartcard.SmartcardFilesystem import MF, DF, TransparentStructureEF from virtualsmartcard.SmartcardFilesystem import MF, DF, TransparentStructureEF
from virtualsmartcard.ConstantDefinitions import FDB from virtualsmartcard.ConstantDefinitions import FDB
from virtualsmartcard.CryptoUtils import protect_string, read_protected_string from virtualsmartcard.CryptoUtils import protect_string, read_protected_string
import virtualsmartcard.SmartcardSAM from virtualsmartcard.SmartcardSAM import SAM
from virtualsmartcard.cards.cryptoflex import CryptoflexSAM, CryptoflexMF from virtualsmartcard.cards.cryptoflex import CryptoflexSAM, CryptoflexMF
from virtualsmartcard.cards.ePass import PassportSAM from virtualsmartcard.cards.ePass import PassportSAM
@@ -40,6 +40,9 @@ from virtualsmartcard.cards.ePass import PassportSAM
#fid=3, dfname='\xa0\x00\x00\x03\x08\x00\x00\x10\x00\x01\x00')) #fid=3, dfname='\xa0\x00\x00\x03\x08\x00\x00\x10\x00\x01\x00'))
class CardGenerator(object): class CardGenerator(object):
"""This class is used to generate the SAM and filesystem for the
different supported card types. It is also able used for persistent storage
(in encrypted form) of the card on disks. """
def __init__(self, card_type=None, sam=None, mf=None): def __init__(self, card_type=None, sam=None, mf=None):
self.type = card_type self.type = card_type
@@ -53,7 +56,7 @@ class CardGenerator(object):
logging.warning("Using default SAM parameters. PIN=%s, Card Nr=%s" logging.warning("Using default SAM parameters. PIN=%s, Card Nr=%s"
& (default_pin, default_cardno)) & (default_pin, default_cardno))
#TODO: Use user provided data #TODO: Use user provided data
self.sam = virtualsmartcard.SmartcardSAM.SAM(default_pin, default_cardno) self.sam = SAM(default_pin, default_cardno)
self.mf = MF(filedescriptor=FDB["DF"]) self.mf = MF(filedescriptor=FDB["DF"])
self.sam.set_MF(self.mf) self.sam.set_MF(self.mf)
@@ -61,7 +64,8 @@ class CardGenerator(object):
def __generate_ePass(self): def __generate_ePass(self):
from PIL import Image from PIL import Image
MRZ = raw_input("Please enter the MRZ as one string: ") #TODO: Sanity checks #TODO: Sanity checks
MRZ = raw_input("Please enter the MRZ as one string: ")
readline.set_completer_delims("") readline.set_completer_delims("")
readline.parse_and_bind("tab: complete") readline.parse_and_bind("tab: complete")
@@ -132,6 +136,7 @@ class CardGenerator(object):
self.sam = PassportSAM(self.mf) self.sam = PassportSAM(self.mf)
def __generate_cryptoflex(self): def __generate_cryptoflex(self):
"""Generate the Filesystem and SAM of a cryptoflex card"""
self.mf = CryptoflexMF() self.mf = CryptoflexMF()
self.mf.append(TransparentStructureEF(parent=self.mf, fid=0x0002, self.mf.append(TransparentStructureEF(parent=self.mf, fid=0x0002,
filedescriptor=0x01, filedescriptor=0x01,