Fixed broken imports

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@500 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
oepen
2011-08-23 10:17:27 +00:00
parent ad398b5d64
commit 4694e1fd1a

View File

@@ -25,7 +25,8 @@ from virtualsmartcard.SmartcardFilesystem import MF, DF, TransparentStructureEF
from virtualsmartcard.ConstantDefinitions import FDB
from virtualsmartcard.CryptoUtils import protect_string, read_protected_string
import virtualsmartcard.SmartcardSAM
from virtualsmartcard.cards import ePass, cryptoflex
from virtualsmartcard.cards.cryptoflex import CryptoflexSAM
from virtualsmartcard.cards.ePass import PassportSAM
# pgp directory
#self.mf.append(DF(parent=self.mf,
@@ -128,7 +129,7 @@ class CardGenerator(object):
mf.append(df)
self.mf = mf
self.sam = ePass.PassportSAM(self.mf)
self.sam = PassportSAM(self.mf)
def __generate_cryptoflex(self):
from virtualsmartcard.SmartcardFilesystem import CryptoflexMF
@@ -137,7 +138,7 @@ class CardGenerator(object):
self.mf.append(TransparentStructureEF(parent=self.mf, fid=0x0002,
filedescriptor=0x01,
data="\x00\x00\x00\x01\x00\x01\x00\x00")) #EF.ICCSN
self.sam = virtualsmartcard.SmartcardSAM.CryptoflexSAM(self.mf)
self.sam = CryptoflexSAM(self.mf)
def generateCard(self):
"""Generate a new card"""