Merge branch 'psytester-patch-2'

virtualsmartcard/src/vpicc/Example_Dataset_Mueller_Gertrud.txt

@@ -0,0 +1,22 @@
+# This is an example dataset file vor the virtual smartcard.
+# Datagroups are just given in plain ascii, separated by =.
+# CommunityID has to be given as hex values enclosed with ' '.
+# The File is passed to the virtual smartcard emulator via
+# command line option -d, with or without path.
+#
+DocumentType=ID
+IssuingState=D
+DateOfExpiry=20201031
+GivenNames = Gertrud
+FamilyNames=Mueller
+ReligiousArtisticName=ǏǐǑǒǓǔǞǟǤǥǦǧǨǩǪǫǬǭǮǯǰǴǵǺǻǼǽǾǿȘșȚțȞȟȪȫȮȯȰ
+AcademicTitle=
+DateOfBirth=19530304
+PlaceOfBirth= BERLIN FRIEDENAU
+Nationality=DE
+Sex=F
+Country=D
+City=BREMEN
+ZIP=28195
+Street =STADTMUSIKANTENWEG 12a
+CommunityID='\x02\x76\x03\x02\x54\x00\x21'

virtualsmartcard/src/vpicc/vicc.in

@@ -45,6 +45,16 @@ parser.add_argument("-f", "--file",
         action="store",
         type=argparse.FileType('r'),
         help="load a saved smart card image")
+parser.add_argument("-d", "--datasetfile",
+        action="store",
+        help="Load the smartcard's data groups (DGs) from the specified dataset file. For DGs not in dataset file default values are used. \
+The data groups in the data set file must have the following syntax: \
+--------------------------------------------------- Datagroupname=Datagroupvalue \
+--------------------------------------------------- \
+For Example: GivenNames=GERTRUD. \
+The following Dataset Elements may be used in the dataset file: \
+DocumentType, IssuingState, DateOfExpiry, GivenNames, FamilyNames, ReligiousArtisticName, AcademicTitle, DateOfBirth, PlaceOfBirth, Nationality, Sex, Country, City, ZIP, Street, CommunityID, dg12, dg13, dg14, dg15, dg16, dg19, dg20, dg21.\
+")
 parser.add_argument("-H", "--hostname",
         action="store",
         type=str,
@@ -126,7 +136,7 @@ if args.reversed:
 else:
     hostname = args.hostname
 
-vicc = VirtualICC(args.file, args.type,
+vicc = VirtualICC(args.file, args.datasetfile, args.type,
         hostname, args.port, readernum=args.reader,
         ef_cardaccess=ef_cardaccess_data, ef_cardsecurity=ef_cardsecurity_data,
         ca_key=ca_key_data, cvca=cvca, disable_checks=args.disable_ta_checks, logginglevel=logginglevel)

virtualsmartcard/src/vpicc/virtualsmartcard/CardGenerator.py

@@ -47,6 +47,7 @@ class CardGenerator(object):
         self.mf = mf
         self.sam = sam
         self.password = None
+        self.datagroups = {}
     
     def __generate_iso_card(self):
         default_pin = "1234"
@@ -166,22 +167,22 @@ class CardGenerator(object):
         eid=DF(parent=self.mf, fid=0xffff, dfname='\xe8\x07\x04\x00\x7f\x00\x07\x03\x02')
         eid.extra_fci_data = '\xab\x75\x84\x01\xa4\xaf\x70\xa0\x10\xb4\x06\x95\x01\x20\x83\x01\x04\xb4\x06\x95\x01\x20\x83\x01\x06\xa0\x54\xa4\x14\x95\x01\x80\x7f\x4c\x0e\x06\x09\x04\x00\x7f\x00\x07\x03\x01\x02\x01\x53\x01\x00\xaf\x22\xa4\x18\x95\x01\x80\x7f\x4c\x12\x06\x09\x04\x00\x7f\x00\x07\x03\x01\x02\x02\x53\x05\x00\x00\x00\x00\x00\xa4\x06\x95\x01\x80\x83\x01\x47\xa4\x18\x95\x01\x80\x7f\x4c\x12\x06\x09\x04\x00\x7f\x00\x07\x03\x01\x02\x02\x53\x05\x00\x00\x00\x00\x10\x7a\x06\x8a\x01\x05\x9e\x01\x03'
         # FIXME access control for eid application
-        DocumentType = 'ID'
+        DocumentType = self.datagroups["DocumentType"] if "DocumentType" in self.datagroups else 'ID'
-        IssuingState = 'DE'
+        IssuingState = self.datagroups["IssuingState"] if "IssuingState" in self.datagroups else 'DE'
-        DateOfExpiry = '20201031'
+        DateOfExpiry = self.datagroups["DateOfExpiry"] if "DateOfExpiry" in self.datagroups else '20201031'
-        GivenNames = 'ERIKA'
+        GivenNames = self.datagroups["GivenNames"] if "GivenNames" in self.datagroups else 'ERIKA'
-        FamilyNames = 'MUSTERMANN'
+        FamilyNames = self.datagroups["FamilyNames"] if "FamilyNames" in self.datagroups else 'MUSTERMANN'
-        ReligiousArtisticName = ''
+        ReligiousArtisticName = self.datagroups["ReligiousArtisticName"] if "ReligiousArtisticName" in self.datagroups else ''
-        AcademicTitle = ''
+        AcademicTitle = self.datagroups["AcademicTitle"] if "AcademicTitle" in self.datagroups else ''
-        DateOfBirth = '19640812'
+        DateOfBirth = self.datagroups["DateOfBirth"] if "DateOfBirth" in self.datagroups else '19640812'
-        PlaceOfBirth = 'BERLIN'
+        PlaceOfBirth = self.datagroups["PlaceOfBirth"] if "PlaceOfBirth" in self.datagroups else 'BERLIN'
-        Nationality = 'DE'
+        Nationality = self.datagroups["Nationality"] if "Nationality" in self.datagroups else 'DE'
-        Sex = 'F'
+        Sex = self.datagroups["Sex"] if "Sex" in self.datagroups else 'F'
-        Country = 'D'
+        Country = self.datagroups["Country"] if "Country" in self.datagroups else 'D'
-        City = 'KOLN'
+        City = self.datagroups["City"] if "City" in self.datagroups else 'KOLN'
-        ZIP = '51147'
+        ZIP = self.datagroups["ZIP"] if "ZIP" in self.datagroups else '51147'
-        Street = 'HEIDESTRASSE 17'
+        Street = self.datagroups["Street"] if "Street" in self.datagroups else 'HEIDESTRASSE 17'
-        CommunityID = '\x12\x34\x56\x78\x90\x12\x34'
+        CommunityID = eval(self.datagroups["CommunityID"])  if "CommunityID" in self.datagroups else '\x12\x34\x56\x78\x90\x12\x34'
         dg1 =  pack([(0x61, 0, [(0x13, 0, DocumentType)])], True)
         dg2 =  pack([(0x62, 0, [(0x13, 0, IssuingState)])], True)
         dg3 =  pack([(0x63, 0, [(0x12, 0, DateOfExpiry)])], True)
@@ -193,11 +194,11 @@ class CardGenerator(object):
         dg9 =  pack([(0x69, 0, [(0xA1, 0, [(0x0C, 0, PlaceOfBirth)])])], True)
         dg10 = pack([(0x6A, 0, [(0x13, 0, Nationality)])], True)
         dg11 = pack([(0x6B, 0, [(0x13, 0, Sex)])], True)
-        dg12 = ''
+        dg12 = self.datagroups["dg12"] if "dg12" in self.datagroups else ''
-        dg13 = ''
+        dg13 = self.datagroups["dg13"] if "dg13" in self.datagroups else ''
-        dg14 = ''
+        dg14 = self.datagroups["dg14"] if "dg14" in self.datagroups else ''
-        dg15 = ''
+        dg15 = self.datagroups["dg15"] if "dg15" in self.datagroups else ''
-        dg16 = ''
+        dg16 = self.datagroups["dg16"] if "dg16" in self.datagroups else ''
         dg17 = pack([(0x71, 0, [(0x30, 0, [
                 (0xAA, 0, [(0x0C, 0, Street)]),
                 (0xAB, 0, [(0x0C, 0, City)]),
@@ -205,9 +206,9 @@ class CardGenerator(object):
                 (0xAE, 0, [(0x13, 0, ZIP)])
                 ])])], True)
         dg18 = pack([(0x72, 0, [(0x04, 0, CommunityID)])], True)
-        dg19 = ''
+        dg19 = self.datagroups["dg19"] if "dg19" in self.datagroups else ''
-        dg20 = ''
+        dg20 = self.datagroups["dg20"] if "dg20" in self.datagroups else ''
-        dg21 = ''
+        dg21 = self.datagroups["dg21"] if "dg21" in self.datagroups else ''
         eid.append(TransparentStructureEF(parent=eid, fid=0x0101, shortfid=0x01, data=dg1))
         eid.append(TransparentStructureEF(parent=eid, fid=0x0102, shortfid=0x02, data=dg2))
         eid.append(TransparentStructureEF(parent=eid, fid=0x0103, shortfid=0x03, data=dg3))
@@ -310,6 +311,16 @@ class CardGenerator(object):
         db["version"] = "0.1"
         db.close()
 
+    def readDatagroups(self, datasetfile):
+        """Read Datagroups from file"""
+        with open(datasetfile, 'r') as f:
+		for line in f:
+			if not line.startswith("#"):
+				line=line.replace(" =", "=")
+				line=line.replace("= ", "=")
+				splitLine = line.split("=")
+				self.datagroups[splitLine[0]] = splitLine[1]
+	f.close()
                           
 if __name__ == "__main__":
     from optparse import OptionParser

virtualsmartcard/src/vpicc/virtualsmartcard/VirtualSmartcard.py

@@ -629,7 +629,7 @@ class VirtualICC(object):
     the vpcd, which forwards it to the application.
     """ 
     
-    def __init__(self, filename, card_type, host, port, readernum=None, ef_cardsecurity=None, ef_cardaccess=None, ca_key=None, cvca=None, disable_checks=False, logginglevel=logging.INFO):
+    def __init__(self, filename, datasetfile, card_type, host, port, readernum=None, ef_cardsecurity=None, ef_cardaccess=None, ca_key=None, cvca=None, disable_checks=False, logginglevel=logging.INFO):
         from os.path import exists
         
         logging.basicConfig(level = logginglevel, 
@@ -648,6 +648,16 @@ class VirtualICC(object):
                 logging.info("Creating new card which will be saved in %s.",
                               self.filename)
 
+        #If a dataset file is specified, read the card's data groups from disk
+        if datasetfile != None:
+        if exists(datasetfile):
+                logging.info("Reading Data Groups from file %s.",
+                            datasetfile)
+                self.cardGenerator.readDatagroups(datasetfile)
+        else:
+                logging.info("Data Set File %s not found, using default values for datagroups.",
+                            self.datasetfile)
+
         MF, SAM = self.cardGenerator.getCard()
         
         #Generate an OS object of the correct card_type