PassportSAM: MRZ for key derivation is now read from MF instead of hard-encoding it in the code

git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@25 96b47cad-a561-4643-ad3b-153ac7d7599c

virtualsmartcard/vpicc/SmartcardSAM.py

@@ -537,12 +537,12 @@ class SAM(object):
         return self.SM_handler.manage_security_environment(p1, p2, data)
 
 class PassportSAM(SAM):       
-    MRZ1 = "P<UTOERIKSSON<<ANNA<MARIA<<<<<<<<<<<<<<<<<<<"
-    MRZ2 = "L898902C<3UTO6908061F9406236ZE184226B<<<<<14"
-    
     def __init__(self,mf,path="testconfig.sam",key="DUMMYKEYDUMMYKEY"):
-        self.mrz1 = self.MRZ1
-        self.mrz2 = self.MRZ2.upper()
+        df = mf.currentDF()
+        ef_dg1 = df.select("fid", 0x0101)
+        dg1 = ef_dg1.readbinary(5)
+        self.mrz1 = dg1[:43]
+        self.mrz2 = dg1[44:]
         self.KSeed = None 
         self.KEnc = None
         self.KMac = None