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

virtualsmartcard: fixed some python3 compatibility

Browse Source 
fixes https://github.com/frankmorgner/vsmartcard/issues/200
This commit is contained in:
Frank Morgner
2022-01-26 19:04:09 +01:00
parent 6c792dc0d9
commit af028aa8c3
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,18 +78,20 @@ class CardGenerator(object):
from virtualsmartcard.cards.ePass import PassportSAM from virtualsmartcard.cards.ePass import PassportSAM
# TODO: Sanity checks # TODO: Sanity checks
MRZ = raw_input("Please enter the MRZ as one string: ") MRZ = input(
"Please enter the Machine Readable Zone\n" +
"Example: P<UTOERIKSSON<<ANNA<MARIX<<<<<<<<<<<<<<<<<<<L898902C<3UTO6908061F9406236ZE184226B<<<<<14\n" +
"MRZ: ")
MRZ = bytes(MRZ, "ascii")
readline.set_completer_delims("") readline.set_completer_delims("")
readline.parse_and_bind("tab: complete") readline.parse_and_bind("tab: complete")
picturepath = raw_input("Please enter the path to an image: ") picturepath = input(
"Please enter the path to your facial image\n"
"Path: ")
picturepath = picturepath.strip() picturepath = picturepath.strip()
# MRZ1 = "P<UTOERIKSSON<<ANNA<MARIX<<<<<<<<<<<<<<<<<<<"
# MRZ2 = "L898902C<3UTO6908061F9406236ZE184226B<<<<<14"
# MRZ = MRZ1 + MRZ2
try: try:
im = Image.open(picturepath) im = Image.open(picturepath)
pic_width, pic_height = im.size pic_width, pic_height = im.size
@@ -123,11 +125,11 @@ class CardGenerator(object):
# EF.DG2 # EF.DG2
if picture is not None: if picture is not None:
IIB = "\x00\x01" + inttostring(pic_width, 2) +\ IIB = b"\x00\x01" + inttostring(pic_width, 2) +\
inttostring(pic_height, 2) + 6 * "\x00" inttostring(pic_height, 2) + 6 * b"\x00"
length = 32 + len(picture) # 32 is the length of IIB + FIB length = 32 + len(picture) # 32 is the length of IIB + FIB
FIB = inttostring(length, 4) + 16 * "\x00" FIB = inttostring(length, 4) + 16 * b"\x00"
FRH = "FAC" + "\x00" + "010" + "\x00" +\ FRH = b"FAC" + b"\x00" + b"010" + b"\x00" +\
inttostring(14 + length, 4) + inttostring(1, 2) inttostring(14 + length, 4) + inttostring(1, 2)
picture = FRH + FIB + IIB + picture picture = FRH + FIB + IIB + picture
DG2 = pack([(0xA1, 8, b"\x87\x02\x01\x01\x88\x02\x05\x01"), DG2 = pack([(0xA1, 8, b"\x87\x02\x01\x01\x88\x02\x05\x01"),