Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions tools/fw_decrypt.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import os
import struct
import binascii
import re

from Crypto.Cipher import AES

DEFAULT_KEY_INDEX = 2
Expand Down Expand Up @@ -99,13 +101,16 @@ def parse_pjl_header(self):
a = self.fh.readline()
if a != b"\x1b%-12345X@PJL \n":
self.err("invalid header line")
pjl_line_a = self.fh.readline().decode("utf8")
pjl_line_b = self.fh.readline().decode("utf8")

if not pjl_line_a.startswith("@PJL") or not pjl_line_b.startswith("@PJL"):
self.err("invalid PJL header line")
while True:
pjl_line_a = self.fh.readline().decode("utf8")
if not pjl_line_a.startswith("@PJL"):
self.err("invalid PJL header line")
if pjl_line_a.startswith("@PJL LPROGRAMRIP"):
# Skip over one or many COMMENT.
break

parts = pjl_line_b.split(" ")
parts = pjl_line_a.split(" ")
if parts[1] != "LPROGRAMRIP":
self.err("unexpected pjl instruction '%s'" % parts[1])

Expand All @@ -115,6 +120,9 @@ def parse_pjl_header(self):
name, value = parts[i].split("=", 1)
if value.startswith('"'):
self.pjl_properties[name] = value[1 : len(value) - 1]
elif re.search(r'^[a-z][a-z0-9]+$', value, re.IGNORECASE):
# Parse: TYPE=MAIN
self.pjl_properties[name] = value
else:
self.pjl_properties[name] = int(value, 0)

Expand Down