Commit 4f1a9baf by devttys0

Fixed jffs2valid.py Python3 bugs

parent acae7cb2
...@@ -13,8 +13,11 @@ class JFFS2ValidPlugin(binwalk.core.plugin.Plugin): ...@@ -13,8 +13,11 @@ class JFFS2ValidPlugin(binwalk.core.plugin.Plugin):
MODULES = ['Signature'] MODULES = ['Signature']
def _check_crc(self, node_header): def _check_crc(self, node_header):
# struct and binascii want a bytes object in Python3
node_header = binwalk.core.compat.str2bytes(node_header)
# Get the header's reported CRC value # Get the header's reported CRC value
if node_header[0:2] == "\x19\x85": if node_header[0:2] == b"\x19\x85":
header_crc = struct.unpack(">I", node_header[8:12])[0] header_crc = struct.unpack(">I", node_header[8:12])[0]
else: else:
header_crc = struct.unpack("<I", node_header[8:12])[0] header_crc = struct.unpack("<I", node_header[8:12])[0]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment