Skip to content

B
binwalk
Commit 51f2dc48 by Craig Heffner
Options

Code formatting, removal of unused code.

parent e7043ba6
Showing with 138 additions and 685 deletions
src/binwalk/core/C.py deleted 100644 → 0
import os
import sys
import glob
import ctypes
import ctypes.util
import binwalk.core.common
from binwalk.core.compat import *
class Function(object):
'''
Container class for defining library functions.
'''
def __init__(self, **kwargs):
self.name = None
self.type = int
for (k, v) in iterator(kwargs):
setattr(self, k, v)
class FunctionHandler(object):
'''
Class for abstracting function calls via ctypes and handling Python 2/3 compatibility issues.
'''
PY2CTYPES = {
bytes: ctypes.c_char_p,
str: ctypes.c_char_p,
int: ctypes.c_int,
float: ctypes.c_float,
bool: ctypes.c_int,
None: ctypes.c_int,
}
RETVAL_CONVERTERS = {
None: int,
int: int,
float: float,
bool: bool,
str: bytes2str,
bytes: str2bytes,
}
def __init__(self, library, function):
'''
Class constructor.
@library - Library handle as returned by ctypes.cdll.LoadLibrary.
@function - An instance of the binwalk.core.C.Function class.
Returns None.
'''
self.name = function.name
self.retype = function.type
self.function = getattr(library, self.name)
if has_key(self.PY2CTYPES, self.retype):
self.function.restype = self.PY2CTYPES[self.retype]
self.retval_converter = self.RETVAL_CONVERTERS[self.retype]
else:
self.function.restype = self.retype
self.retval_converter = None
# raise Exception("Unknown return type: '%s'" % self.retype)
def run(self, *args):
'''
Executes the library function, handling Python 2/3 compatibility and properly converting the return type.
@*args - Library function arguments.
Returns the return value from the libraray function.
'''
args = list(args)
# Python3 expects a bytes object for char *'s, not a str.
# This allows us to pass either, regardless of the Python version.
for i in range(0, len(args)):
if isinstance(args[i], str):
args[i] = str2bytes(args[i])
retval = self.function(*args)
if self.retval_converter is not None:
retval = self.retval_converter(retval)
return retval
class Library(object):
'''
Class for loading the specified library via ctypes.
'''
def __init__(self, library, functions):
'''
Class constructor.
@library - Library name (e.g., 'magic' for libmagic), or a list of names.
@functions - A dictionary of function names and their return types (e.g., {'magic_buffer' : str})
Returns None.
'''
self.settings = binwalk.core.settings.Settings()
self.library = ctypes.cdll.LoadLibrary(self.find_library(library))
if not self.library:
raise Exception("Failed to load library '%s'" % library)
for function in functions:
f = FunctionHandler(self.library, function)
setattr(self, function.name, f.run)
def find_library(self, libraries):
'''
Locates the specified library.
@libraries - Library name (e.g., 'magic' for libmagic), or a list of names.
Returns a string to be passed to ctypes.cdll.LoadLibrary.
'''
lib_path = None
prefix = binwalk.core.common.get_libs_path()
if isinstance(libraries, str):
libraries = [libraries]
for library in libraries:
system_paths = {
'linux': [os.path.join(prefix, 'lib%s.so' % library), '/usr/local/lib/lib%s.so' % library],
'cygwin': [os.path.join(prefix, 'lib%s.so' % library), '/usr/local/lib/lib%s.so' % library],
'win32': [os.path.join(prefix, 'lib%s.dll' % library), '%s.dll' % library],
'darwin': [os.path.join(prefix, 'lib%s.dylib' % library),
'/opt/local/lib/lib%s.dylib' % library,
'/usr/local/lib/lib%s.dylib' % library,
] + glob.glob(
'/usr/local/Cellar/*%s*/*/lib/lib%s.dylib' % (library, library)),
}
for i in range(2, 4):
system_paths['linux%d' % i] = system_paths['linux']
# Search the common install directories first; these are usually not in the library search path
# Search these *first*, since a) they are the most likely locations and b) there may be a
# discrepency between where ctypes.util.find_library and
# ctypes.cdll.LoadLibrary search for libs.
for path in system_paths[sys.platform]:
binwalk.core.common.debug("Searching for '%s'" % path)
if os.path.exists(path):
lib_path = path
break
# If we failed to find the library, check the standard library
# search paths
if not lib_path:
lib_path = ctypes.util.find_library(library)
# Use the first library that we can find
if lib_path:
binwalk.core.common.debug(
"Found library '%s' at: %s" % (library, lib_path))
break
else:
binwalk.core.common.debug(
"Could not find library '%s'" % library)
# If we still couldn't find the library, error out
if not lib_path:
raise Exception("Failed to locate libraries '%s'" % str(libraries))
return lib_path
src/binwalk/core/display.py
...@@ -109,13 +109,14 @@ class Display(object): ...@@ -109,13 +109,14 @@ class Display(object):
self._fprint( self._fprint(
"MD5 Checksum: %s\n", [md5sum], csv=False, filter=False) "MD5 Checksum: %s\n", [md5sum], csv=False, filter=False)
if self.custom_verbose_format and self.custom_verbose_args: if self.custom_verbose_format and self.custom_verbose_args:
self._fprint( self._fprint(self.custom_verbose_format,
self.custom_verbose_format, self.custom_verbose_args, csv=False, filter=False) self.custom_verbose_args,
csv=False,
filter=False)
self._fprint("%s", "\n", csv=False, filter=False) self._fprint("%s", "\n", csv=False, filter=False)
self._fprint(self.header_format, args, filter=False) self._fprint(self.header_format, args, filter=False)
self._fprint( self._fprint("%s", ["-" * self.HEADER_WIDTH + "\n"], csv=False, filter=False)
"%s", ["-" * self.HEADER_WIDTH + "\n"], csv=False, filter=False)
def result(self, *args): def result(self, *args):
# Convert to list for item assignment # Convert to list for item assignment
...@@ -218,8 +219,7 @@ class Display(object): ...@@ -218,8 +219,7 @@ class Display(object):
# Add any remaining data (guarunteed to be max_line_wrap_length # Add any remaining data (guarunteed to be max_line_wrap_length
# long or shorter) to self.string_parts # long or shorter) to self.string_parts
self._append_to_data_parts( self._append_to_data_parts(line, offset, offset + len(line[offset:]))
line, offset, offset + len(line[offset:]))
# Append self.string_parts to formatted_line; each part seperated # Append self.string_parts to formatted_line; each part seperated
# by delim # by delim
...@@ -244,8 +244,7 @@ class Display(object): ...@@ -244,8 +244,7 @@ class Display(object):
import termios import termios
# Get the terminal window width # Get the terminal window width
hw = struct.unpack( hw = struct.unpack('hh', fcntl.ioctl(1, termios.TIOCGWINSZ, '1234'))
'hh', fcntl.ioctl(1, termios.TIOCGWINSZ, '1234'))
self.SCREEN_WIDTH = self.HEADER_WIDTH = hw[1] self.SCREEN_WIDTH = self.HEADER_WIDTH = hw[1]
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
......
src/binwalk/core/magic.py
...@@ -164,13 +164,11 @@ class SignatureLine(object): ...@@ -164,13 +164,11 @@ class SignatureLine(object):
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
raise ParserException( raise ParserException("Failed to expand string '%s' with integer '%s' in line '%s'" % (self.value, n, line))
"Failed to expand string '%s' with integer '%s' in line '%s'" % (self.value, n, line))
try: try:
self.value = binwalk.core.compat.string_decode(self.value) self.value = binwalk.core.compat.string_decode(self.value)
except ValueError as e: except ValueError as e:
raise ParserException( raise ParserException("Failed to decode string value '%s' in line '%s'" % (self.value, line))
"Failed to decode string value '%s' in line '%s'" % (self.value, line))
# If a regex was specified, compile it # If a regex was specified, compile it
elif self.type == 'regex': elif self.type == 'regex':
self.regex = True self.regex = True
...@@ -180,21 +178,18 @@ class SignatureLine(object): ...@@ -180,21 +178,18 @@ class SignatureLine(object):
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
raise ParserException( raise ParserException("Invalid regular expression '%s': %s" % (self.value, str(e)))
"Invalid regular expression '%s': %s" % (self.value, str(e)))
# Non-string types are integer values # Non-string types are integer values
else: else:
try: try:
self.value = int(self.value, 0) self.value = int(self.value, 0)
except ValueError as e: except ValueError as e:
raise ParserException( raise ParserException("Failed to convert value '%s' to an integer on line '%s'" % (self.value, line))
"Failed to convert value '%s' to an integer on line '%s'" % (self.value, line))
# Sanity check to make sure the first line of a signature has an # Sanity check to make sure the first line of a signature has an
# explicit value # explicit value
if self.level == 0 and self.value is None: if self.level == 0 and self.value is None:
raise ParserException( raise ParserException("First element of a signature must specify a non-wildcard value: '%s'" % (line))
"First element of a signature must specify a non-wildcard value: '%s'" % (line))
# Set the size and struct format value for the specified data type. # Set the size and struct format value for the specified data type.
# This must be done, obviously, after the value has been parsed out # This must be done, obviously, after the value has been parsed out
...@@ -232,8 +227,7 @@ class SignatureLine(object): ...@@ -232,8 +227,7 @@ class SignatureLine(object):
self.fmt = 'i' self.fmt = 'i'
self.size = 4 self.size = 4
else: else:
raise ParserException( raise ParserException("Unknown data type '%s' in line '%s'" % (self.type, line))
"Unknown data type '%s' in line '%s'" % (self.type, line))
# The struct module uses the same characters for specifying signed and unsigned data types, # The struct module uses the same characters for specifying signed and unsigned data types,
# except that signed data types are upper case. The above if-else code sets self.fmt to the # except that signed data types are upper case. The above if-else code sets self.fmt to the
...@@ -374,8 +368,7 @@ class Signature(object): ...@@ -374,8 +368,7 @@ class Signature(object):
if not binwalk.core.compat.has_key(line.tags, 'overlap'): if not binwalk.core.compat.has_key(line.tags, 'overlap'):
for i in range(1, line.size): for i in range(1, line.size):
if restr[i:] == restr[0:(line.size - i)]: if restr[i:] == restr[0:(line.size - i)]:
binwalk.core.common.warning( binwalk.core.common.warning("Signature '%s' is a self-overlapping signature!" % line.text)
"Signature '%s' is a self-overlapping signature!" % line.text)
break break
return re.compile(re.escape(restr)) return re.compile(re.escape(restr))
...@@ -492,8 +485,7 @@ class Magic(object): ...@@ -492,8 +485,7 @@ class Magic(object):
s = expression[:period].rfind('(') + 1 s = expression[:period].rfind('(') + 1
# The offset address may be an evaluatable expression, such as '(4+0.L)', typically the result # The offset address may be an evaluatable expression, such as '(4+0.L)', typically the result
# of the original offset being something like '(&0.L)'. # of the original offset being something like '(&0.L)'.
o = binwalk.core.common.MathExpression( o = binwalk.core.common.MathExpression(expression[s:period]).value
expression[s:period]).value
t = expression[period + 1] t = expression[period + 1]
# Re-build just the parsed offset portion of the expression # Re-build just the parsed offset portion of the expression
...@@ -512,24 +504,19 @@ class Magic(object): ...@@ -512,24 +504,19 @@ class Magic(object):
try: try:
# Big and little endian byte format # Big and little endian byte format
if t in ['b', 'B']: if t in ['b', 'B']:
v = struct.unpack( v = struct.unpack('b', binwalk.core.compat.str2bytes(self.data[o:o + 1]))[0]
'b', binwalk.core.compat.str2bytes(self.data[o:o + 1]))[0]
# Little endian short format # Little endian short format
elif t == 's': elif t == 's':
v = struct.unpack( v = struct.unpack('<h', binwalk.core.compat.str2bytes(self.data[o:o + 2]))[0]
'<h', binwalk.core.compat.str2bytes(self.data[o:o + 2]))[0]
# Little endian long format # Little endian long format
elif t == 'l': elif t == 'l':
v = struct.unpack( v = struct.unpack('<i', binwalk.core.compat.str2bytes(self.data[o:o + 4]))[0]
'<i', binwalk.core.compat.str2bytes(self.data[o:o + 4]))[0]
# Big endian short format # Big endian short format
elif t == 'S': elif t == 'S':
v = struct.unpack( v = struct.unpack('>h', binwalk.core.compat.str2bytes(self.data[o:o + 2]))[0]
'>h', binwalk.core.compat.str2bytes(self.data[o:o + 2]))[0]
# Bit endian long format # Bit endian long format
elif t == 'L': elif t == 'L':
v = struct.unpack( v = struct.unpack('>i', binwalk.core.compat.str2bytes(self.data[o:o + 4]))[0]
'>i', binwalk.core.compat.str2bytes(self.data[o:o + 4]))[0]
# struct.error is thrown if there is not enough bytes in # struct.error is thrown if there is not enough bytes in
# self.data for the specified format type # self.data for the specified format type
except struct.error as e: except struct.error as e:
...@@ -589,15 +576,13 @@ class Magic(object): ...@@ -589,15 +576,13 @@ class Magic(object):
ple = '%d+' % previous_line_end ple = '%d+' % previous_line_end
# Allow users to use either the '&0' (libmagic) or '&+0' (explcit addition) sytaxes; # Allow users to use either the '&0' (libmagic) or '&+0' (explcit addition) sytaxes;
# replace both with the ple text. # replace both with the ple text.
line_offset_text = line.offset.replace( line_offset_text = line.offset.replace('&+', ple).replace('&', ple)
'&+', ple).replace('&', ple)
# Evaluate the expression # Evaluate the expression
line_offset = self._do_math(offset, line_offset_text) line_offset = self._do_math(offset, line_offset_text)
# Sanity check # Sanity check
if not isinstance(line_offset, int): if not isinstance(line_offset, int):
raise ParserException( raise ParserException("Failed to convert offset '%s' to a number: '%s'" % (line.offset, line.text))
"Failed to convert offset '%s' to a number: '%s'" % (line.offset, line.text))
# The start of the data needed by this line is at offset + line_offset. # The start of the data needed by this line is at offset + line_offset.
# The end of the data will be line.size bytes later. # The end of the data will be line.size bytes later.
...@@ -607,8 +592,7 @@ class Magic(object): ...@@ -607,8 +592,7 @@ class Magic(object):
# If the line has a packed format string, unpack it # If the line has a packed format string, unpack it
if line.pkfmt: if line.pkfmt:
try: try:
dvalue = struct.unpack( dvalue = struct.unpack(line.pkfmt, binwalk.core.compat.str2bytes(self.data[start:end]))[0]
line.pkfmt, binwalk.core.compat.str2bytes(self.data[start:end]))[0]
# Not enough bytes left in self.data for the specified # Not enough bytes left in self.data for the specified
# format size # format size
except struct.error as e: except struct.error as e:
...@@ -624,8 +608,7 @@ class Magic(object): ...@@ -624,8 +608,7 @@ class Magic(object):
# Else, just terminate the string at the first newline, # Else, just terminate the string at the first newline,
# carriage return, or NULL byte # carriage return, or NULL byte
else: else:
dvalue = self.data[start:end].split( dvalue = self.data[start:end].split('\x00')[0].split('\r')[0].split('\n')[0]
'\x00')[0].split('\r')[0].split('\n')[0]
# Non-wildcard strings have a known length, specified in # Non-wildcard strings have a known length, specified in
# the signature line # the signature line
else: else:
...@@ -665,8 +648,13 @@ class Magic(object): ...@@ -665,8 +648,13 @@ class Magic(object):
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
raise ParserException("Operation '" + str(dvalue) + " " + str( raise ParserException("Operation '" +
line.operator) + "= " + str(line.opvalue) + "' failed: " + str(e)) str(dvalue) +
" " +
str(line.operator) +
"= " +
str(line.opvalue) +
"' failed: " + str(e))
# Does the data (dvalue) match the specified comparison? # Does the data (dvalue) match the specified comparison?
if ((line.value is None) or if ((line.value is None) or
...@@ -896,8 +884,7 @@ class Magic(object): ...@@ -896,8 +884,7 @@ class Magic(object):
# existing signature entry, something is very wrong with the # existing signature entry, something is very wrong with the
# signature file. # signature file.
else: else:
raise ParserException( raise ParserException("Invalid signature line: '%s'" % line)
"Invalid signature line: '%s'" % line)
# Add the final signature to the signature list # Add the final signature to the signature list
if signature: if signature:
......
src/binwalk/core/module.py
...@@ -498,8 +498,7 @@ class Module(object): ...@@ -498,8 +498,7 @@ class Module(object):
if r.display: if r.display:
display_args = self._build_display_args(r) display_args = self._build_display_args(r)
if display_args: if display_args:
self.config.display.format_strings( self.config.display.format_strings(self.HEADER_FORMAT, self.RESULT_FORMAT)
self.HEADER_FORMAT, self.RESULT_FORMAT)
self.config.display.result(*display_args) self.config.display.result(*display_args)
return r return r
...@@ -520,14 +519,12 @@ class Module(object): ...@@ -520,14 +519,12 @@ class Module(object):
self.errors.append(e) self.errors.append(e)
if e.exception: if e.exception:
sys.stderr.write( sys.stderr.write("\n" + e.module + " Exception: " + str(e.exception) + "\n")
"\n" + e.module + " Exception: " + str(e.exception) + "\n")
sys.stderr.write("-" * exception_header_width + "\n") sys.stderr.write("-" * exception_header_width + "\n")
traceback.print_exc(file=sys.stderr) traceback.print_exc(file=sys.stderr)
sys.stderr.write("-" * exception_header_width + "\n\n") sys.stderr.write("-" * exception_header_width + "\n\n")
elif e.description: elif e.description:
sys.stderr.write( sys.stderr.write("\n" + e.module + " Error: " + e.description + "\n\n")
"\n" + e.module + " Error: " + e.description + "\n\n")
def header(self): def header(self):
''' '''
...@@ -535,17 +532,13 @@ class Module(object): ...@@ -535,17 +532,13 @@ class Module(object):
Returns None. Returns None.
''' '''
self.config.display.format_strings( self.config.display.format_strings(self.HEADER_FORMAT, self.RESULT_FORMAT)
self.HEADER_FORMAT, self.RESULT_FORMAT) self.config.display.add_custom_header(self.VERBOSE_FORMAT, self.VERBOSE)
self.config.display.add_custom_header(
self.VERBOSE_FORMAT, self.VERBOSE)
if type(self.HEADER) == type([]): if type(self.HEADER) == type([]):
self.config.display.header( self.config.display.header(*self.HEADER, file_name=self.current_target_file_name)
*self.HEADER, file_name=self.current_target_file_name)
elif self.HEADER: elif self.HEADER:
self.config.display.header( self.config.display.header(self.HEADER, file_name=self.current_target_file_name)
self.HEADER, file_name=self.current_target_file_name)
def footer(self): def footer(self):
''' '''
...@@ -577,8 +570,7 @@ class Module(object): ...@@ -577,8 +570,7 @@ class Module(object):
self.config.verbose = self.config.display.verbose = True self.config.verbose = self.config.display.verbose = True
if not self.config.files: if not self.config.files:
binwalk.core.common.debug( binwalk.core.common.debug("No target files specified, module %s terminated" % self.name)
"No target files specified, module %s terminated" % self.name)
return False return False
self.reset_dependencies() self.reset_dependencies()
...@@ -592,8 +584,7 @@ class Module(object): ...@@ -592,8 +584,7 @@ class Module(object):
return False return False
try: try:
self.config.display.format_strings( self.config.display.format_strings(self.HEADER_FORMAT, self.RESULT_FORMAT)
self.HEADER_FORMAT, self.RESULT_FORMAT)
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -648,8 +639,7 @@ class Modules(object): ...@@ -648,8 +639,7 @@ class Modules(object):
self.arguments = [] self.arguments = []
self.executed_modules = {} self.executed_modules = {}
self.default_dependency_modules = {} self.default_dependency_modules = {}
self.status = Status( self.status = Status(completed=0, total=0, fp=None, running=False, shutdown=False, finished=False)
completed=0, total=0, fp=None, running=False, shutdown=False, finished=False)
self.status_server_started = False self.status_server_started = False
self.status_service = None self.status_service = None
...@@ -723,13 +713,11 @@ class Modules(object): ...@@ -723,13 +713,11 @@ class Modules(object):
continue continue
module_name = file_name[:-3] module_name = file_name[:-3]
try: try:
user_module = imp.load_source( user_module = imp.load_source(module_name, os.path.join(user_modules, file_name))
module_name, os.path.join(user_modules, file_name))
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
binwalk.core.common.warning( binwalk.core.common.warning("Error loading module '%s': %s" % (file_name, str(e)))
"Error loading module '%s': %s" % (file_name, str(e)))
for (name, module) in inspect.getmembers(user_module): for (name, module) in inspect.getmembers(user_module):
if inspect.isclass(module) and hasattr(module, attribute): if inspect.isclass(module) and hasattr(module, attribute):
...@@ -772,8 +760,7 @@ class Modules(object): ...@@ -772,8 +760,7 @@ class Modules(object):
short_opt = " " short_opt = " "
fmt = " %%s %%s%%-%ds%%s\n" % (25 - len(long_opt)) fmt = " %%s %%s%%-%ds%%s\n" % (25 - len(long_opt))
help_string += fmt % ( help_string += fmt % (short_opt, long_opt, optargs, module_option.description)
short_opt, long_opt, optargs, module_option.description)
return help_string + "\n" return help_string + "\n"
...@@ -855,8 +842,7 @@ class Modules(object): ...@@ -855,8 +842,7 @@ class Modules(object):
if hasattr(binwalk.modules, dependency.name): if hasattr(binwalk.modules, dependency.name):
dependency.module = getattr(binwalk.modules, dependency.name) dependency.module = getattr(binwalk.modules, dependency.name)
else: else:
raise ModuleException( raise ModuleException("%s depends on %s which was not found in binwalk.modules.__init__.py\n" % (str(module), dependency.name))
"%s depends on %s which was not found in binwalk.modules.__init__.py\n" % (str(module), dependency.name))
# No recursive dependencies, thanks # No recursive dependencies, thanks
if dependency.module == module: if dependency.module == module:
...@@ -869,14 +855,12 @@ class Modules(object): ...@@ -869,14 +855,12 @@ class Modules(object):
# Modules that are not enabled (e.g., extraction module) can load any dependency as long as they don't # Modules that are not enabled (e.g., extraction module) can load any dependency as long as they don't
# set any custom kwargs for those dependencies. # set any custom kwargs for those dependencies.
if module_enabled or not dependency.kwargs: if module_enabled or not dependency.kwargs:
depobj = self.run( depobj = self.run(dependency.module, dependency=True, kwargs=dependency.kwargs)
dependency.module, dependency=True, kwargs=dependency.kwargs)
# If a dependency failed, consider this a non-recoverable error and # If a dependency failed, consider this a non-recoverable error and
# raise an exception # raise an exception
if depobj.errors: if depobj.errors:
raise ModuleException( raise ModuleException("Failed to load " + dependency.name + " module")
"Failed to load " + dependency.name + " module")
else: else:
attributes[dependency.attribute] = depobj attributes[dependency.attribute] = depobj
...@@ -958,8 +942,7 @@ class Modules(object): ...@@ -958,8 +942,7 @@ class Modules(object):
last_priority[name] = module_option.priority last_priority[name] = module_option.priority
try: try:
kwargs[name] = module_option.convert( kwargs[name] = module_option.convert(args[module_option.long], default_value)
args[module_option.long], default_value)
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -990,8 +973,7 @@ class Modules(object): ...@@ -990,8 +973,7 @@ class Modules(object):
if not hasattr(obj, k): if not hasattr(obj, k):
setattr(obj, k, v) setattr(obj, k, v)
else: else:
raise Exception( raise Exception("binwalk.core.module.Modules.process_kwargs: %s has no attribute 'KWARGS'" % str(obj))
"binwalk.core.module.Modules.process_kwargs: %s has no attribute 'KWARGS'" % str(obj))
def status_server(self, port): def status_server(self, port):
''' '''
...@@ -1005,11 +987,9 @@ class Modules(object): ...@@ -1005,11 +987,9 @@ class Modules(object):
if self.status_server_started == False: if self.status_server_started == False:
self.status_server_started = True self.status_server_started = True
try: try:
self.status_service = binwalk.core.statuserver.StatusServer( self.status_service = binwalk.core.statuserver.StatusServer(port, self)
port, self)
except Exception as e: except Exception as e:
binwalk.core.common.warning( binwalk.core.common.warning("Failed to start status server on port %d: %s" % (port, str(e)))
"Failed to start status server on port %d: %s" % (port, str(e)))
def process_kwargs(obj, kwargs): def process_kwargs(obj, kwargs):
......
src/binwalk/core/plugin.py
...@@ -119,8 +119,7 @@ class Plugins(object): ...@@ -119,8 +119,7 @@ class Plugins(object):
except IgnoreFileException as e: except IgnoreFileException as e:
raise e raise e
except Exception as e: except Exception as e:
binwalk.core.common.warning( binwalk.core.common.warning("%s.%s failed: %s" % (callback.__module__, callback.__name__, e))
"%s.%s failed: %s" % (callback.__module__, callback.__name__, e))
def _find_plugin_class(self, plugin): def _find_plugin_class(self, plugin):
for (name, klass) in inspect.getmembers(plugin, inspect.isclass): for (name, klass) in inspect.getmembers(plugin, inspect.isclass):
...@@ -177,8 +176,7 @@ class Plugins(object): ...@@ -177,8 +176,7 @@ class Plugins(object):
module = file_name[:-len(self.MODULE_EXTENSION)] module = file_name[:-len(self.MODULE_EXTENSION)]
try: try:
plugin = imp.load_source( plugin = imp.load_source(module, os.path.join(plugins[key]['path'], file_name))
module, os.path.join(plugins[key]['path'], file_name))
plugin_class = self._find_plugin_class(plugin) plugin_class = self._find_plugin_class(plugin)
plugins[key]['enabled'][module] = True plugins[key]['enabled'][module] = True
...@@ -186,8 +184,7 @@ class Plugins(object): ...@@ -186,8 +184,7 @@ class Plugins(object):
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
binwalk.core.common.warning( binwalk.core.common.warning("Error loading plugin '%s': %s" % (file_name, str(e)))
"Error loading plugin '%s': %s" % (file_name, str(e)))
plugins[key]['enabled'][module] = False plugins[key]['enabled'][module] = False
try: try:
...@@ -208,8 +205,7 @@ class Plugins(object): ...@@ -208,8 +205,7 @@ class Plugins(object):
def _load_plugin_modules(self, plugins): def _load_plugin_modules(self, plugins):
for module in plugins['modules']: for module in plugins['modules']:
try: try:
file_path = os.path.join( file_path = os.path.join(plugins['path'], module + self.MODULE_EXTENSION)
plugins['path'], module + self.MODULE_EXTENSION)
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception: except Exception:
...@@ -231,8 +227,7 @@ class Plugins(object): ...@@ -231,8 +227,7 @@ class Plugins(object):
pass pass
try: try:
self.load_file.append( self.load_file.append(getattr(class_instance, self.LOADFILE))
getattr(class_instance, self.LOADFILE))
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -246,8 +241,7 @@ class Plugins(object): ...@@ -246,8 +241,7 @@ class Plugins(object):
pass pass
try: try:
self.post_scan.append( self.post_scan.append(getattr(class_instance, self.POSTSCAN))
getattr(class_instance, self.POSTSCAN))
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
...@@ -263,8 +257,7 @@ class Plugins(object): ...@@ -263,8 +257,7 @@ class Plugins(object):
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
binwalk.core.common.warning( binwalk.core.common.warning("Failed to load plugin module '%s': %s" % (module, str(e)))
"Failed to load plugin module '%s': %s" % (module, str(e)))
def pre_scan_callbacks(self, obj): def pre_scan_callbacks(self, obj):
return self._call_plugins(self.pre_scan) return self._call_plugins(self.pre_scan)
......
src/binwalk/core/settings.py
...@@ -41,25 +41,16 @@ class Settings: ...@@ -41,25 +41,16 @@ class Settings:
self.system_dir = common.get_module_path() self.system_dir = common.get_module_path()
# Build the paths to all user-specific files # Build the paths to all user-specific files
self.user = common.GenericContainer( self.user = common.GenericContainer(binarch=self._user_path(self.BINWALK_MAGIC_DIR, self.BINARCH_MAGIC_FILE),
binarch=self._user_path( magic=self._magic_signature_files(user_only=True),
self.BINWALK_MAGIC_DIR, self.BINARCH_MAGIC_FILE), extract=self._user_path(self.BINWALK_CONFIG_DIR, self.EXTRACT_FILE),
magic=self._magic_signature_files( modules=self._user_path(self.BINWALK_MODULES_DIR),
user_only=True),
extract=self._user_path(
self.BINWALK_CONFIG_DIR, self.EXTRACT_FILE),
modules=self._user_path(
self.BINWALK_MODULES_DIR),
plugins=self._user_path(self.BINWALK_PLUGINS_DIR)) plugins=self._user_path(self.BINWALK_PLUGINS_DIR))
# Build the paths to all system-wide files # Build the paths to all system-wide files
self.system = common.GenericContainer( self.system = common.GenericContainer(binarch=self._system_path(self.BINWALK_MAGIC_DIR, self.BINARCH_MAGIC_FILE),
binarch=self._system_path( magic=self._magic_signature_files(system_only=True),
self.BINWALK_MAGIC_DIR, self.BINARCH_MAGIC_FILE), extract=self._system_path(self.BINWALK_CONFIG_DIR, self.EXTRACT_FILE),
magic=self._magic_signature_files(
system_only=True),
extract=self._system_path(
self.BINWALK_CONFIG_DIR, self.EXTRACT_FILE),
plugins=self._system_path(self.BINWALK_PLUGINS_DIR)) plugins=self._system_path(self.BINWALK_PLUGINS_DIR))
def _magic_signature_files(self, system_only=False, user_only=False): def _magic_signature_files(self, system_only=False, user_only=False):
...@@ -72,18 +63,15 @@ class Settings: ...@@ -72,18 +63,15 @@ class Settings:
Returns a list of user/system magic signature files. Returns a list of user/system magic signature files.
''' '''
files = [] files = []
user_binarch = self._user_path( user_binarch = self._user_path(self.BINWALK_MAGIC_DIR, self.BINARCH_MAGIC_FILE)
self.BINWALK_MAGIC_DIR, self.BINARCH_MAGIC_FILE) system_binarch = self._system_path(self.BINWALK_MAGIC_DIR, self.BINARCH_MAGIC_FILE)
system_binarch = self._system_path(
self.BINWALK_MAGIC_DIR, self.BINARCH_MAGIC_FILE)
def list_files(dir_path): def list_files(dir_path):
# Ignore hidden dotfiles. # Ignore hidden dotfiles.
return [os.path.join(dir_path, x) for x in os.listdir(dir_path) if not x.startswith('.')] return [os.path.join(dir_path, x) for x in os.listdir(dir_path) if not x.startswith('.')]
if not system_only: if not system_only:
user_dir = os.path.join( user_dir = os.path.join(self.user_dir, self.BINWALK_USER_DIR, self.BINWALK_MAGIC_DIR)
self.user_dir, self.BINWALK_USER_DIR, self.BINWALK_MAGIC_DIR)
files += list_files(user_dir) files += list_files(user_dir)
if not user_only: if not user_only:
system_dir = os.path.join(self.system_dir, self.BINWALK_MAGIC_DIR) system_dir = os.path.join(self.system_dir, self.BINWALK_MAGIC_DIR)
......
src/binwalk/core/statuserver.py
...@@ -28,22 +28,17 @@ class StatusRequestHandler(SocketServer.BaseRequestHandler): ...@@ -28,22 +28,17 @@ class StatusRequestHandler(SocketServer.BaseRequestHandler):
time.sleep(0.1) time.sleep(0.1)
try: try:
self.request.send( self.request.send(binwalk.core.compat.str2bytes('\b' * last_status_message_len))
binwalk.core.compat.str2bytes('\b' * last_status_message_len)) self.request.send(binwalk.core.compat.str2bytes(' ' * last_status_message_len))
self.request.send( self.request.send(binwalk.core.compat.str2bytes('\b' * last_status_message_len))
binwalk.core.compat.str2bytes(' ' * last_status_message_len))
self.request.send(
binwalk.core.compat.str2bytes('\b' * last_status_message_len))
if self.server.binwalk.status.shutdown: if self.server.binwalk.status.shutdown:
self.server.binwalk.status.finished = True self.server.binwalk.status.finished = True
break break
if self.server.binwalk.status.total != 0: if self.server.binwalk.status.total != 0:
percentage = ( percentage = ((float(self.server.binwalk.status.completed) / float(self.server.binwalk.status.total)) * 100)
(float(self.server.binwalk.status.completed) / float(self.server.binwalk.status.total)) * 100) status_message = message_format % (self.server.binwalk.status.fp.path,
status_message = message_format % (
self.server.binwalk.status.fp.path,
percentage, percentage,
self.server.binwalk.status.completed, self.server.binwalk.status.completed,
self.server.binwalk.status.total) self.server.binwalk.status.total)
...@@ -53,15 +48,13 @@ class StatusRequestHandler(SocketServer.BaseRequestHandler): ...@@ -53,15 +48,13 @@ class StatusRequestHandler(SocketServer.BaseRequestHandler):
continue continue
last_status_message_len = len(status_message) last_status_message_len = len(status_message)
self.request.send( self.request.send(binwalk.core.compat.str2bytes(status_message))
binwalk.core.compat.str2bytes(status_message))
message_sent = True message_sent = True
except IOError as e: except IOError as e:
if e.errno == errno.EPIPE: if e.errno == errno.EPIPE:
break break
except Exception as e: except Exception as e:
binwalk.core.common.debug( binwalk.core.common.debug('StatusRequestHandler exception: ' + str(e) + '\n')
'StatusRequestHandler exception: ' + str(e) + '\n')
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
...@@ -77,8 +70,7 @@ class ThreadedStatusServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer): ...@@ -77,8 +70,7 @@ class ThreadedStatusServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer):
class StatusServer(object): class StatusServer(object):
def __init__(self, port, binwalk): def __init__(self, port, binwalk):
self.server = ThreadedStatusServer( self.server = ThreadedStatusServer(('127.0.0.1', port), StatusRequestHandler)
('127.0.0.1', port), StatusRequestHandler)
self.server.binwalk = binwalk self.server.binwalk = binwalk
t = threading.Thread(target=self.server.serve_forever) t = threading.Thread(target=self.server.serve_forever)
......
src/binwalk/modules/__init__.py
...@@ -15,8 +15,3 @@ from binwalk.modules.hexdiff import HexDiff ...@@ -15,8 +15,3 @@ from binwalk.modules.hexdiff import HexDiff
from binwalk.modules.general import General from binwalk.modules.general import General
from binwalk.modules.extractor import Extractor from binwalk.modules.extractor import Extractor
from binwalk.modules.entropy import Entropy from binwalk.modules.entropy import Entropy
# These are depreciated.
# from binwalk.modules.binvis import Plotter
# from binwalk.modules.hashmatch import HashMatch
# from binwalk.modules.heuristics import HeuristicCompressionAnalyzer
src/binwalk/modules/compression.py
...@@ -37,8 +37,7 @@ class LZMA(object): ...@@ -37,8 +37,7 @@ class LZMA(object):
# Add an extraction rule # Add an extraction rule
if self.module.extractor.enabled: if self.module.extractor.enabled:
self.module.extractor.add_rule( self.module.extractor.add_rule(regex='^%s' % self.DESCRIPTION.lower(), extension="7z", cmd=self.extractor)
regex='^%s' % self.DESCRIPTION.lower(), extension="7z", cmd=self.extractor)
def extractor(self, file_name): def extractor(self, file_name):
# Open and read the file containing the raw compressed data. # Open and read the file containing the raw compressed data.
...@@ -53,8 +52,7 @@ class LZMA(object): ...@@ -53,8 +52,7 @@ class LZMA(object):
# and a fake output file size field. # and a fake output file size field.
header = chr(self.properties) + \ header = chr(self.properties) + \
self.dictionaries[-1] + ("\xFF" * 8) self.dictionaries[-1] + ("\xFF" * 8)
binwalk.core.common.BlockFile( binwalk.core.common.BlockFile(file_name, "wb").write(header + compressed_data)
file_name, "wb").write(header + compressed_data)
# Try to extract it with all the normal lzma extractors until one # Try to extract it with all the normal lzma extractors until one
# works # works
...@@ -83,8 +81,7 @@ class LZMA(object): ...@@ -83,8 +81,7 @@ class LZMA(object):
def parse_header(self, header): def parse_header(self, header):
(pb, lp, lc) = self.parse_property(header[0]) (pb, lp, lc) = self.parse_property(header[0])
dictionary = struct.unpack( dictionary = struct.unpack("<I", binwalk.core.compat.str2bytes(header[1:5]))[0]
"<I", binwalk.core.compat.str2bytes(header[1:5]))[0]
return LZMAHeader(pb=pb, lp=lp, lc=lc, dictionary=dictionary) return LZMAHeader(pb=pb, lp=lp, lc=lc, dictionary=dictionary)
def build_properties(self): def build_properties(self):
...@@ -107,12 +104,10 @@ class LZMA(object): ...@@ -107,12 +104,10 @@ class LZMA(object):
if self.module.partial_scan == True: if self.module.partial_scan == True:
# For partial scans, only use the largest dictionary value # For partial scans, only use the largest dictionary value
self.dictionaries.append( self.dictionaries.append(binwalk.core.compat.bytes2str(struct.pack("<I", 2 ** 25)))
binwalk.core.compat.bytes2str(struct.pack("<I", 2 ** 25)))
else: else:
for n in range(16, 26): for n in range(16, 26):
self.dictionaries.append( self.dictionaries.append(binwalk.core.compat.bytes2str(struct.pack("<I", 2 ** n)))
binwalk.core.compat.bytes2str(struct.pack("<I", 2 ** n)))
def build_headers(self): def build_headers(self):
self.headers = set() self.headers = set()
...@@ -148,8 +143,7 @@ class LZMA(object): ...@@ -148,8 +143,7 @@ class LZMA(object):
break break
if result is not None: if result is not None:
self.properties = self.build_property( self.properties = self.build_property(result.pb, result.lp, result.lc)
result.pb, result.lp, result.lc)
description = "%s, properties: 0x%.2X [pb: %d, lp: %d, lc: %d], dictionary size: %d" % (self.DESCRIPTION, description = "%s, properties: 0x%.2X [pb: %d, lp: %d, lc: %d], dictionary size: %d" % (self.DESCRIPTION,
self.properties, self.properties,
result.pb, result.pb,
...@@ -175,8 +169,7 @@ class Deflate(object): ...@@ -175,8 +169,7 @@ class Deflate(object):
# Add an extraction rule # Add an extraction rule
if self.module.extractor.enabled: if self.module.extractor.enabled:
self.module.extractor.add_rule( self.module.extractor.add_rule(regex='^%s' % self.DESCRIPTION.lower(), extension="deflate", cmd=self.extractor)
regex='^%s' % self.DESCRIPTION.lower(), extension="deflate", cmd=self.extractor)
def extractor(self, file_name): def extractor(self, file_name):
in_data = "" in_data = ""
...@@ -193,8 +186,7 @@ class Deflate(object): ...@@ -193,8 +186,7 @@ class Deflate(object):
in_data += data[:dlen] in_data += data[:dlen]
try: try:
out_data = zlib.decompress( out_data = zlib.decompress(binwalk.core.compat.str2bytes(in_data), -15)
binwalk.core.compat.str2bytes(in_data), -15)
with binwalk.core.common.BlockFile(out_file, 'w') as fp_out: with binwalk.core.common.BlockFile(out_file, 'w') as fp_out:
fp_out.write(out_data) fp_out.write(out_data)
retval = True retval = True
...@@ -275,11 +267,9 @@ class RawCompression(Module): ...@@ -275,11 +267,9 @@ class RawCompression(Module):
for i in range(0, dlen): for i in range(0, dlen):
for decompressor in self.decompressors: for decompressor in self.decompressors:
description = decompressor.decompress( description = decompressor.decompress(data[i:i + decompressor.BLOCK_SIZE])
data[i:i + decompressor.BLOCK_SIZE])
if description: if description:
self.result( self.result(description=description, file=fp, offset=fp.tell() - dlen + i)
description=description, file=fp, offset=fp.tell() - dlen + i)
if self.stop_on_first_hit: if self.stop_on_first_hit:
file_done = True file_done = True
break break
......
src/binwalk/modules/disasm.py
...@@ -99,8 +99,7 @@ class Disasm(Module): ...@@ -99,8 +99,7 @@ class Disasm(Module):
self.disasm_data_size = self.min_insn_count * 10 self.disasm_data_size = self.min_insn_count * 10
for arch in self.ARCHITECTURES: for arch in self.ARCHITECTURES:
self.disassemblers.append( self.disassemblers.append((capstone.Cs(arch.type, (arch.mode + arch.endianess)), arch.description))
(capstone.Cs(arch.type, (arch.mode + arch.endianess)), arch.description))
def scan_file(self, fp): def scan_file(self, fp):
total_read = 0 total_read = 0
...@@ -124,18 +123,15 @@ class Disasm(Module): ...@@ -124,18 +123,15 @@ class Disasm(Module):
# Don't pass the entire data block into disasm_lite, it's horribly inefficient # Don't pass the entire data block into disasm_lite, it's horribly inefficient
# to pass large strings around in Python. Break it up into # to pass large strings around in Python. Break it up into
# smaller code blocks instead. # smaller code blocks instead.
code_block = binwalk.core.compat.str2bytes( code_block = binwalk.core.compat.str2bytes(data[block_offset:block_offset + self.disasm_data_size])
data[block_offset:block_offset + self.disasm_data_size])
# If this code block doesn't contain at least two different bytes, skip it # If this code block doesn't contain at least two different bytes, skip it
# to prevent false positives (e.g., "\x00\x00\x00\x00" is a # to prevent false positives (e.g., "\x00\x00\x00\x00" is a
# nop in MIPS). # nop in MIPS).
if len(set(code_block)) >= 2: if len(set(code_block)) >= 2:
for (md, description) in self.disassemblers: for (md, description) in self.disassemblers:
insns = [insn for insn in md.disasm_lite( insns = [insn for insn in md.disasm_lite(code_block, (total_read + block_offset))]
code_block, (total_read + block_offset))] binwalk.core.common.debug("0x%.8X %s, at least %d valid instructions" % ((total_read + block_offset),
binwalk.core.common.debug(
"0x%.8X %s, at least %d valid instructions" % ((total_read + block_offset),
description, description,
len(insns))) len(insns)))
...@@ -150,8 +146,7 @@ class Disasm(Module): ...@@ -150,8 +146,7 @@ class Disasm(Module):
if result.count >= self.THRESHOLD: if result.count >= self.THRESHOLD:
break break
else: else:
result = ArchResult( result = ArchResult(offset=total_read +
offset=total_read +
block_offset + fp.offset, block_offset + fp.offset,
description=description, description=description,
insns=insns, insns=insns,
...@@ -168,8 +163,7 @@ class Disasm(Module): ...@@ -168,8 +163,7 @@ class Disasm(Module):
if r.valid and r.display: if r.valid and r.display:
if self.config.verbose: if self.config.verbose:
for (position, size, mnem, opnds) in result.insns: for (position, size, mnem, opnds) in result.insns:
self.result( self.result(offset=position, file=fp, description="%s %s" % (mnem, opnds))
offset=position, file=fp, description="%s %s" % (mnem, opnds))
if not self.keep_going: if not self.keep_going:
return return
......
src/binwalk/modules/entropy.py
...@@ -102,8 +102,7 @@ class Entropy(Module): ...@@ -102,8 +102,7 @@ class Entropy(Module):
if len(description) > self.max_description_length: if len(description) > self.max_description_length:
self.max_description_length = len(description) self.max_description_length = len(description)
self.file_markers[result.file.name].append( self.file_markers[result.file.name].append((result.offset, description))
(result.offset, description))
# If other modules have been run and they produced results, don't spam # If other modules have been run and they produced results, don't spam
# the terminal with entropy results # the terminal with entropy results
...@@ -157,8 +156,7 @@ class Entropy(Module): ...@@ -157,8 +156,7 @@ class Entropy(Module):
if self.block_size is None: if self.block_size is None:
block_size = fp.size / self.DEFAULT_DATA_POINTS block_size = fp.size / self.DEFAULT_DATA_POINTS
# Round up to the nearest DEFAULT_BLOCK_SIZE (1024) # Round up to the nearest DEFAULT_BLOCK_SIZE (1024)
block_size = int( block_size = int(block_size + ((self.DEFAULT_BLOCK_SIZE - block_size) % self.DEFAULT_BLOCK_SIZE))
block_size + ((self.DEFAULT_BLOCK_SIZE - block_size) % self.DEFAULT_BLOCK_SIZE))
else: else:
block_size = self.block_size block_size = self.block_size
...@@ -240,8 +238,7 @@ class Entropy(Module): ...@@ -240,8 +238,7 @@ class Entropy(Module):
''' '''
# Entropy is a simple ratio of: <zlib compressed size> / <original # Entropy is a simple ratio of: <zlib compressed size> / <original
# size> # size>
e = float( e = float(float(len(zlib.compress(str2bytes(data), 9))) / float(len(data)))
float(len(zlib.compress(str2bytes(data), 9))) / float(len(data)))
if truncate and e > 1.0: if truncate and e > 1.0:
e = 1.0 e = 1.0
......
src/binwalk/modules/extractor.py
...@@ -165,11 +165,9 @@ class Extractor(Module): ...@@ -165,11 +165,9 @@ class Extractor(Module):
fp.close() fp.close()
self.pending.append(f) self.pending.append(f)
except IOError as e: except IOError as e:
binwalk.core.common.warning( binwalk.core.common.warning("Ignoring file '%s': %s" % (f, str(e)))
"Ignoring file '%s': %s" % (f, str(e)))
else: else:
binwalk.core.common.warning( binwalk.core.common.warning("Ignoring file '%s': Not a regular file" % f)
"Ignoring file '%s': Not a regular file" % f)
def reset(self): def reset(self):
# Holds a list of pending files that should be scanned; only populated # Holds a list of pending files that should be scanned; only populated
...@@ -441,8 +439,7 @@ class Extractor(Module): ...@@ -441,8 +439,7 @@ class Extractor(Module):
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
raise Exception( raise Exception("Extractor.load_from_file failed to load file '%s': %s" % (fname, str(e)))
"Extractor.load_from_file failed to load file '%s': %s" % (fname, str(e)))
def load_defaults(self): def load_defaults(self):
''' '''
...@@ -464,8 +461,7 @@ class Extractor(Module): ...@@ -464,8 +461,7 @@ class Extractor(Module):
raise e raise e
except Exception as e: except Exception as e:
if binwalk.core.common.DEBUG: if binwalk.core.common.DEBUG:
raise Exception( raise Exception("Extractor.load_defaults failed to load file '%s': %s" % (extract_file, str(e)))
"Extractor.load_defaults failed to load file '%s': %s" % (extract_file, str(e)))
def get_output_directory_override(self): def get_output_directory_override(self):
''' '''
...@@ -516,19 +512,16 @@ class Extractor(Module): ...@@ -516,19 +512,16 @@ class Extractor(Module):
subdir = "" subdir = ""
if self.output_directory_override: if self.output_directory_override:
output_directory = os.path.join( output_directory = os.path.join(self.directory, subdir, self.output_directory_override)
self.directory, subdir, self.output_directory_override)
else: else:
outdir = os.path.join(self.directory, subdir, '_' + basename) outdir = os.path.join(self.directory, subdir, '_' + basename)
output_directory = unique_file_name( output_directory = unique_file_name(outdir, extension='extracted')
outdir, extension='extracted')
if not os.path.exists(output_directory): if not os.path.exists(output_directory):
os.mkdir(output_directory) os.mkdir(output_directory)
self.extraction_directories[path] = output_directory self.extraction_directories[path] = output_directory
self.output[path].directory = os.path.realpath( self.output[path].directory = os.path.realpath(output_directory) + os.path.sep
output_directory) + os.path.sep
# Else, just use the already created directory # Else, just use the already created directory
else: else:
output_directory = self.extraction_directories[path] output_directory = self.extraction_directories[path]
...@@ -719,8 +712,7 @@ class Extractor(Module): ...@@ -719,8 +712,7 @@ class Extractor(Module):
try: try:
codes[i] = int(codes[i], 0) codes[i] = int(codes[i], 0)
except ValueError as e: except ValueError as e:
binwalk.core.common.warning( binwalk.core.common.warning("The specified return code '%s' for extractor '%s' is not a valid number!" % (codes[i], values[0]))
"The specified return code '%s' for extractor '%s' is not a valid number!" % (codes[i], values[0]))
values[3] = codes values[3] = codes
if len(values) >= 5: if len(values) >= 5:
...@@ -827,8 +819,7 @@ class Extractor(Module): ...@@ -827,8 +819,7 @@ class Extractor(Module):
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
binwalk.core.common.warning( binwalk.core.common.warning("Internal extractor '%s' failed with exception: '%s'" % (str(cmd), str(e)))
"Internal extractor '%s' failed with exception: '%s'" % (str(cmd), str(e)))
elif cmd: elif cmd:
# If not in debug mode, create a temporary file to redirect # If not in debug mode, create a temporary file to redirect
# stdout and stderr to # stdout and stderr to
...@@ -840,31 +831,25 @@ class Extractor(Module): ...@@ -840,31 +831,25 @@ class Extractor(Module):
while self.UNIQUE_PATH_DELIMITER in cmd: while self.UNIQUE_PATH_DELIMITER in cmd:
need_unique_path = cmd.split(self.UNIQUE_PATH_DELIMITER)[ need_unique_path = cmd.split(self.UNIQUE_PATH_DELIMITER)[
1].split(self.UNIQUE_PATH_DELIMITER)[0] 1].split(self.UNIQUE_PATH_DELIMITER)[0]
unique_path = binwalk.core.common.unique_file_name( unique_path = binwalk.core.common.unique_file_name(need_unique_path)
need_unique_path) cmd = cmd.replace(self.UNIQUE_PATH_DELIMITER + need_unique_path + self.UNIQUE_PATH_DELIMITER, unique_path)
cmd = cmd.replace(
self.UNIQUE_PATH_DELIMITER + need_unique_path + self.UNIQUE_PATH_DELIMITER, unique_path)
# Execute. # Execute.
for command in cmd.split("&&"): for command in cmd.split("&&"):
# Replace all instances of FILE_NAME_PLACEHOLDER in the # Replace all instances of FILE_NAME_PLACEHOLDER in the
# command with fname # command with fname
command = command.strip().replace( command = command.strip().replace(self.FILE_NAME_PLACEHOLDER, fname)
self.FILE_NAME_PLACEHOLDER, fname)
binwalk.core.common.debug( binwalk.core.common.debug("subprocess.call(%s, stdout=%s, stderr=%s)" % (command, str(tmp), str(tmp)))
"subprocess.call(%s, stdout=%s, stderr=%s)" % (command, str(tmp), str(tmp))) rval = subprocess.call(shlex.split(command), stdout=tmp, stderr=tmp)
rval = subprocess.call(
shlex.split(command), stdout=tmp, stderr=tmp)
if rval in codes: if rval in codes:
retval = True retval = True
else: else:
retval = False retval = False
binwalk.core.common.debug( binwalk.core.common.debug('External extractor command "%s" completed with return code %d (success: %s)' % (cmd, rval, str(retval)))
'External extractor command "%s" completed with return code %d (success: %s)' % (cmd, rval, str(retval)))
# TODO: Should errors from all commands in a command string be checked? Currently we only support # TODO: Should errors from all commands in a command string be checked? Currently we only support
# specifying one set of error codes, so at the moment, this is not done; it is up to the # specifying one set of error codes, so at the moment, this is not done; it is up to the
...@@ -876,8 +861,7 @@ class Extractor(Module): ...@@ -876,8 +861,7 @@ class Extractor(Module):
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
binwalk.core.common.warning( binwalk.core.common.warning("Extractor.execute failed to run external extractor '%s': %s, '%s' might not be installed correctly" % (str(cmd), str(e), str(cmd)))
"Extractor.execute failed to run external extractor '%s': %s, '%s' might not be installed correctly" % (str(cmd), str(e), str(cmd)))
retval = None retval = None
if tmp is not None: if tmp is not None:
......
src/binwalk/modules/general.py
...@@ -134,11 +134,9 @@ class General(Module): ...@@ -134,11 +134,9 @@ class General(Module):
# Build file name filter regex rules # Build file name filter regex rules
if self.file_name_include_regex: if self.file_name_include_regex:
self.file_name_include_regex = re.compile( self.file_name_include_regex = re.compile(self.file_name_include_regex)
self.file_name_include_regex)
if self.file_name_exclude_regex: if self.file_name_exclude_regex:
self.file_name_exclude_regex = re.compile( self.file_name_exclude_regex = re.compile(self.file_name_exclude_regex)
self.file_name_exclude_regex)
self.settings = binwalk.core.settings.Settings() self.settings = binwalk.core.settings.Settings()
self.display = binwalk.core.display.Display(log=self.log_file, self.display = binwalk.core.display.Display(log=self.log_file,
......
src/binwalk/modules/heuristics.py deleted 100644 → 0
# Routines to perform Chi Squared tests.
# Used for fingerprinting unknown areas of high entropy (e.g., is this block of high entropy data compressed or encrypted?).
# Inspired by people who actually know what they're doing:
# http://www.fourmilab.ch/random/
import math
from binwalk.core.compat import *
from binwalk.core.module import Module, Kwarg, Option, Dependency
class ChiSquare(object):
'''
Performs a Chi Squared test against the provided data.
'''
IDEAL = 256.0
def __init__(self):
'''
Class constructor.
Returns None.
'''
self.bytes = {}
self.freedom = self.IDEAL - 1
# Initialize the self.bytes dictionary with keys for all possible byte
# values (0 - 255)
for i in range(0, int(self.IDEAL)):
self.bytes[chr(i)] = 0
self.reset()
def reset(self):
self.xc2 = 0.0
self.byte_count = 0
for key in self.bytes.keys():
self.bytes[key] = 0
def update(self, data):
'''
Updates the current byte counts with new data.
@data - String of bytes to update.
Returns None.
'''
# Count the number of occurances of each byte value
for i in data:
self.bytes[i] += 1
self.byte_count += len(data)
def chisq(self):
'''
Calculate the Chi Square critical value.
Returns the critical value.
'''
expected = self.byte_count / self.IDEAL
if expected:
for byte in self.bytes.values():
self.xc2 += ((byte - expected) ** 2) / expected
return self.xc2
class EntropyBlock(object):
def __init__(self, **kwargs):
self.start = None
self.end = None
self.length = None
for (k, v) in iterator(kwargs):
setattr(self, k, v)
class HeuristicCompressionAnalyzer(Module):
'''
Performs analysis and attempts to interpret the results.
'''
BLOCK_SIZE = 32
CHI_CUTOFF = 512
ENTROPY_TRIGGER = .90
MIN_BLOCK_SIZE = 4096
BLOCK_OFFSET = 1024
ENTROPY_BLOCK_SIZE = 1024
TITLE = "Heuristic Compression"
DEPENDS = [
Dependency(name='Entropy',
attribute='entropy',
kwargs={
'enabled': True, 'do_plot': False, 'display_results': False, 'block_size': ENTROPY_BLOCK_SIZE}),
]
CLI = [
Option(short='H',
long='heuristic',
kwargs={'enabled': True},
description='Heuristically classify high entropy data'),
Option(short='a',
long='trigger',
kwargs={'trigger_level': 0},
type=float,
description='Set the entropy trigger level (0.0 - 1.0, default: %.2f)' % ENTROPY_TRIGGER),
]
KWARGS = [
Kwarg(name='enabled', default=False),
Kwarg(name='trigger_level', default=ENTROPY_TRIGGER),
]
def init(self):
self.blocks = {}
self.HEADER[-1] = "HEURISTIC ENTROPY ANALYSIS"
# Trigger level sanity check
if self.trigger_level > 1.0:
self.trigger_level = 1.0
elif self.trigger_level < 0.0:
self.trigger_level = 0.0
if self.config.block:
self.block_size = self.config.block
else:
self.block_size = self.BLOCK_SIZE
for result in self.entropy.results:
if not has_key(self.blocks, result.file.name):
self.blocks[result.file.name] = []
if result.entropy >= self.trigger_level and (not self.blocks[result.file.name] or self.blocks[result.file.name][-1].end is not None):
self.blocks[result.file.name].append(
EntropyBlock(start=result.offset + self.BLOCK_OFFSET))
elif result.entropy < self.trigger_level and self.blocks[result.file.name] and self.blocks[result.file.name][-1].end is None:
self.blocks[result.file.name][
-1].end = result.offset - self.BLOCK_OFFSET
def run(self):
for fp in iter(self.next_file, None):
if has_key(self.blocks, fp.name):
self.header()
for block in self.blocks[fp.name]:
if block.end is None:
block.length = fp.offset + fp.length - block.start
else:
block.length = block.end - block.start
if block.length >= self.MIN_BLOCK_SIZE:
self.analyze(fp, block)
self.footer()
def analyze(self, fp, block):
'''
Perform analysis and interpretation.
'''
i = 0
num_error = 0
analyzer_results = []
chi = ChiSquare()
fp.seek(block.start)
while i < block.length:
j = 0
(d, dlen) = fp.read_block()
if dlen < 1:
break
while j < dlen:
chi.reset()
data = d[j:j + self.block_size]
if len(data) < self.block_size:
break
chi.update(data)
if chi.chisq() >= self.CHI_CUTOFF:
num_error += 1
j += self.block_size
if (j + i) > block.length:
break
i += dlen
if num_error > 0:
verdict = 'Moderate entropy data, best guess: compressed'
else:
verdict = 'High entropy data, best guess: encrypted'
desc = '%s, size: %d, %d low entropy blocks' % (
verdict, block.length, num_error)
self.result(offset=block.start, description=desc, file=fp)
src/binwalk/modules/hexdiff.py
...@@ -149,8 +149,7 @@ class HexDiff(Module): ...@@ -149,8 +149,7 @@ class HexDiff(Module):
hexbyte = "XX" hexbyte = "XX"
asciibyte = "." asciibyte = "."
else: else:
(hexbyte, asciibyte) = self.hexascii( (hexbyte, asciibyte) = self.hexascii(block_data, block_data[fp][i], i)
block_data, block_data[fp][i], i)
hexline += "%s " % hexbyte hexline += "%s " % hexbyte
asciiline += "%s" % asciibyte asciiline += "%s" % asciibyte
......
src/binwalk/plugins/arcadyan.py
...@@ -15,8 +15,7 @@ class ArcadyanDeobfuscator(binwalk.core.plugin.Plugin): ...@@ -15,8 +15,7 @@ class ArcadyanDeobfuscator(binwalk.core.plugin.Plugin):
BLOCK_SIZE = 32 BLOCK_SIZE = 32
BLOCK1_OFFSET = 4 BLOCK1_OFFSET = 4
BLOCK2_OFFSET = 0x68 BLOCK2_OFFSET = 0x68
MIN_FILE_SIZE = ( MIN_FILE_SIZE = (OBFUSCATION_MAGIC_SIZE + BLOCK2_OFFSET + BLOCK_SIZE)
OBFUSCATION_MAGIC_SIZE + BLOCK2_OFFSET + BLOCK_SIZE)
BLOCK1_START = BLOCK1_OFFSET BLOCK1_START = BLOCK1_OFFSET
BLOCK1_END = BLOCK1_START + BLOCK_SIZE BLOCK1_END = BLOCK1_START + BLOCK_SIZE
...@@ -34,8 +33,7 @@ class ArcadyanDeobfuscator(binwalk.core.plugin.Plugin): ...@@ -34,8 +33,7 @@ class ArcadyanDeobfuscator(binwalk.core.plugin.Plugin):
def init(self): def init(self):
if self.module.extractor.enabled: if self.module.extractor.enabled:
self.module.extractor.add_rule( self.module.extractor.add_rule(regex="^obfuscated arcadyan firmware",
regex="^obfuscated arcadyan firmware",
extension="obfuscated", extension="obfuscated",
cmd=self.extractor) cmd=self.extractor)
...@@ -59,8 +57,7 @@ class ArcadyanDeobfuscator(binwalk.core.plugin.Plugin): ...@@ -59,8 +57,7 @@ class ArcadyanDeobfuscator(binwalk.core.plugin.Plugin):
# Nibble-swap each byte in block 1 # Nibble-swap each byte in block 1
nswap = '' nswap = ''
for i in range(self.BLOCK1_START, self.BLOCK1_END): for i in range(self.BLOCK1_START, self.BLOCK1_END):
nswap += chr(((ord(deobfuscated[i]) & 0x0F) << 4) + ( nswap += chr(((ord(deobfuscated[i]) & 0x0F) << 4) + ((ord(deobfuscated[i]) & 0xF0) >> 4))
(ord(deobfuscated[i]) & 0xF0) >> 4))
deobfuscated = deobfuscated[ deobfuscated = deobfuscated[
self.P1_START:self.P1_END] + nswap + deobfuscated[self.BLOCK1_END:] self.P1_START:self.P1_END] + nswap + deobfuscated[self.BLOCK1_END:]
...@@ -74,8 +71,7 @@ class ArcadyanDeobfuscator(binwalk.core.plugin.Plugin): ...@@ -74,8 +71,7 @@ class ArcadyanDeobfuscator(binwalk.core.plugin.Plugin):
self.P1_START:self.P1_END] + bswap + deobfuscated[self.BLOCK1_END:] self.P1_START:self.P1_END] + bswap + deobfuscated[self.BLOCK1_END:]
if deobfuscated: if deobfuscated:
out = binwalk.core.common.BlockFile( out = binwalk.core.common.BlockFile((os.path.splitext(fname)[0] + '.deobfuscated'), "wb")
(os.path.splitext(fname)[0] + '.deobfuscated'), "wb")
out.write(deobfuscated) out.write(deobfuscated)
out.close() out.close()
return True return True
......
src/binwalk/plugins/compressd.py deleted 100644 → 0
# import binwalk.core.C
import binwalk.core.plugin
# from binwalk.core.common import *
class CompressdPlugin(binwalk.core.plugin.Plugin):
# '''
# Searches for and validates compress'd data.
# '''
MODULES = ['Signature']
# READ_SIZE = 64
# COMPRESS42 = "compress42"
# COMPRESS42_FUNCTIONS = [
# binwalk.core.C.Function(name="is_compressed", type=bool),
#]
# comp = None
# def init(self):
# self.comp = binwalk.core.C.Library(self.COMPRESS42, self.COMPRESS42_FUNCTIONS)
# This plugin is currently disabled due to the need to move away from supporting C
# libraries and into a pure Python project, for cross-platform support and ease of
# installation / package maintenance. A Python implementation will likely need to
# be custom developed in the future, but for now, since this compression format is
# not very common, especially in firmware, simply disable it.
# self.comp = None
# def scan(self, result):
# if self.comp and result.file and result.description.lower().startswith("compress'd data"):
# fd = self.module.config.open_file(result.file.name, offset=result.offset, length=self.READ_SIZE)
# compressed_data = fd.read(self.READ_SIZE)
# fd.close()
# if not self.comp.is_compressed(compressed_data, len(compressed_data)):
# result.valid = False
src/binwalk/plugins/cpio.py
...@@ -44,8 +44,7 @@ class CPIOPlugin(binwalk.core.plugin.Plugin): ...@@ -44,8 +44,7 @@ class CPIOPlugin(binwalk.core.plugin.Plugin):
return False return False
try: try:
result = subprocess.call( result = subprocess.call(['cpio', '-d', '-i', '--no-absolute-filenames'],
['cpio', '-d', '-i', '--no-absolute-filenames'],
stdin=fpin, stdin=fpin,
stderr=fperr, stderr=fperr,
stdout=fperr) stdout=fperr)
......
src/binwalk/plugins/dlromfsextract.py
...@@ -11,8 +11,7 @@ except ImportError as e: ...@@ -11,8 +11,7 @@ except ImportError as e:
class RomFSCommon(object): class RomFSCommon(object):
def _read_next_word(self): def _read_next_word(self):
value = struct.unpack( value = struct.unpack("%sL" % self.endianess, self.data[self.index:self.index + 4])[0]
"%sL" % self.endianess, self.data[self.index:self.index + 4])[0]
self.index += 4 self.index += 4
return value return value
...@@ -152,8 +151,7 @@ class RomFS(object): ...@@ -152,8 +151,7 @@ class RomFS(object):
while True: while True:
try: try:
entry = RomFSEntry( entry = RomFSEntry(self.data[offset:offset + self.FILE_ENTRY_SIZE], endianess=self.endianess)
self.data[offset:offset + self.FILE_ENTRY_SIZE], endianess=self.endianess)
except ValueError as e: except ValueError as e:
break break
...@@ -168,8 +166,7 @@ class RomFS(object): ...@@ -168,8 +166,7 @@ class RomFS(object):
if entry.type & entry.DIR_STRUCT_MASK: if entry.type & entry.DIR_STRUCT_MASK:
entries[entry.uid].type = "directory" entries[entry.uid].type = "directory"
ds = RomFSDirStruct( ds = RomFSDirStruct(self.data[entry.offset:entry.offset + entry.size], endianess=self.endianess)
self.data[entry.offset:entry.offset + entry.size], endianess=self.endianess)
for (uid, name) in ds.ls: for (uid, name) in ds.ls:
if not uid in entries: if not uid in entries:
entries[uid] = FileContainer() entries[uid] = FileContainer()
......
src/binwalk/plugins/gzipvalid.py
...@@ -17,8 +17,7 @@ class GzipValidPlugin(binwalk.core.plugin.Plugin): ...@@ -17,8 +17,7 @@ class GzipValidPlugin(binwalk.core.plugin.Plugin):
# If this result is a gzip signature match, try to decompress the data # If this result is a gzip signature match, try to decompress the data
if result.file and result.description.lower().startswith('gzip'): if result.file and result.description.lower().startswith('gzip'):
# Seek to and read the suspected gzip data # Seek to and read the suspected gzip data
fd = self.module.config.open_file( fd = self.module.config.open_file(result.file.name, offset=result.offset, length=self.MAX_DATA_SIZE)
result.file.name, offset=result.offset, length=self.MAX_DATA_SIZE)
data = fd.read(self.MAX_DATA_SIZE) data = fd.read(self.MAX_DATA_SIZE)
fd.close() fd.close()
......
src/binwalk/plugins/hilink.py
...@@ -31,8 +31,7 @@ class HilinkDecryptor(binwalk.core.plugin.Plugin): ...@@ -31,8 +31,7 @@ class HilinkDecryptor(binwalk.core.plugin.Plugin):
if self.enabled is True and self.module.extractor.enabled is True: if self.enabled is True and self.module.extractor.enabled is True:
# Add an extraction rule for encrypted Hilink firmware signature # Add an extraction rule for encrypted Hilink firmware signature
# results # results
self.module.extractor.add_rule( self.module.extractor.add_rule(regex="^%s" % self.SIGNATURE_DESCRIPTION,
regex="^%s" % self.SIGNATURE_DESCRIPTION,
extension="enc", extension="enc",
cmd=self._decrypt_and_extract) cmd=self._decrypt_and_extract)
...@@ -72,25 +71,20 @@ class HilinkDecryptor(binwalk.core.plugin.Plugin): ...@@ -72,25 +71,20 @@ class HilinkDecryptor(binwalk.core.plugin.Plugin):
if result.description.lower().startswith(self.SIGNATURE_DESCRIPTION) is True: if result.description.lower().startswith(self.SIGNATURE_DESCRIPTION) is True:
# Read in the first 64 bytes of the suspected encrypted # Read in the first 64 bytes of the suspected encrypted
# uImage header # uImage header
fd = self.module.config.open_file( fd = self.module.config.open_file(result.file.name, offset=result.offset)
result.file.name, offset=result.offset) encrypted_header_data = binwalk.core.compat.str2bytes(fd.read(64))
encrypted_header_data = binwalk.core.compat.str2bytes(
fd.read(64))
fd.close() fd.close()
# Decrypt the header # Decrypt the header
decrypted_header_data = self._hilink_decrypt( decrypted_header_data = self._hilink_decrypt(encrypted_header_data)
encrypted_header_data)
# Pull out the image size and image name fields from the decrypted uImage header # Pull out the image size and image name fields from the decrypted uImage header
# and add them to the printed description. # and add them to the printed description.
result.size = struct.unpack( result.size = struct.unpack(b">L", decrypted_header_data[12:16])[0]
b">L", decrypted_header_data[12:16])[0]
result.description += ", size: %d" % (result.size) result.description += ", size: %d" % (result.size)
# NOTE: The description field should be 32 bytes? Hilink seems to use only 24 bytes for this field, # NOTE: The description field should be 32 bytes? Hilink seems to use only 24 bytes for this field,
# even though the header size is still 64 bytes? # even though the header size is still 64 bytes?
result.description += ', image name: "%s"' % binwalk.core.compat.bytes2str( result.description += ', image name: "%s"' % binwalk.core.compat.bytes2str(decrypted_header_data[32:56]).strip("\x00")
decrypted_header_data[32:56]).strip("\x00")
# Do some basic validation on the decrypted size and image # Do some basic validation on the decrypted size and image
# name fields # name fields
......
src/binwalk/plugins/jffs2valid.py
...@@ -25,8 +25,7 @@ class JFFS2ValidPlugin(binwalk.core.plugin.Plugin): ...@@ -25,8 +25,7 @@ class JFFS2ValidPlugin(binwalk.core.plugin.Plugin):
header_crc = struct.unpack("<I", node_header[8:12])[0] header_crc = struct.unpack("<I", node_header[8:12])[0]
# Calculate the actual CRC # Calculate the actual CRC
calculated_header_crc = ( calculated_header_crc = (binascii.crc32(node_header[0:8], -1) ^ -1) & 0xffffffff
binascii.crc32(node_header[0:8], -1) ^ -1) & 0xffffffff
# Make sure they match # Make sure they match
return (header_crc == calculated_header_crc) return (header_crc == calculated_header_crc)
...@@ -35,8 +34,7 @@ class JFFS2ValidPlugin(binwalk.core.plugin.Plugin): ...@@ -35,8 +34,7 @@ class JFFS2ValidPlugin(binwalk.core.plugin.Plugin):
if result.file and result.description.lower().startswith('jffs2 filesystem'): if result.file and result.description.lower().startswith('jffs2 filesystem'):
# Seek to and read the suspected JFFS2 node header # Seek to and read the suspected JFFS2 node header
fd = self.module.config.open_file( fd = self.module.config.open_file(result.file.name, offset=result.offset)
result.file.name, offset=result.offset)
# JFFS2 headers are only 12 bytes in size, but reading larger amounts of # JFFS2 headers are only 12 bytes in size, but reading larger amounts of
# data from disk speeds up repeated disk access and decreases performance # data from disk speeds up repeated disk access and decreases performance
# hits (disk caching?). # hits (disk caching?).
......
src/binwalk/plugins/lzmamod.py
...@@ -63,5 +63,4 @@ class LZMAModPlugin(binwalk.core.plugin.Plugin): ...@@ -63,5 +63,4 @@ class LZMAModPlugin(binwalk.core.plugin.Plugin):
if result.description.lower().startswith(self.SIGNATURE) and "invalid uncompressed size" in result.description: if result.description.lower().startswith(self.SIGNATURE) and "invalid uncompressed size" in result.description:
if "properties: 0x5D" in result.description and "invalid dictionary size" not in result.description: if "properties: 0x5D" in result.description and "invalid dictionary size" not in result.description:
result.valid = True result.valid = True
result.description = result.description.split( result.description = result.description.split("invalid uncompressed size")[0] + "missing uncompressed size"
"invalid uncompressed size")[0] + "missing uncompressed size"
src/binwalk/plugins/lzmavalid.py
...@@ -52,8 +52,7 @@ class LZMAPlugin(binwalk.core.plugin.Plugin): ...@@ -52,8 +52,7 @@ class LZMAPlugin(binwalk.core.plugin.Plugin):
if result.valid and result.file and result.description.lower().startswith('lzma compressed data'): if result.valid and result.file and result.description.lower().startswith('lzma compressed data'):
# Seek to and read the suspected lzma data # Seek to and read the suspected lzma data
fd = self.module.config.open_file( fd = self.module.config.open_file(result.file.name, offset=result.offset, length=self.MAX_DATA_SIZE)
result.file.name, offset=result.offset, length=self.MAX_DATA_SIZE)
data = fd.read(self.MAX_DATA_SIZE) data = fd.read(self.MAX_DATA_SIZE)
fd.close() fd.close()
......
src/binwalk/plugins/tar.py
...@@ -42,8 +42,7 @@ class TarPlugin(binwalk.core.plugin.Plugin): ...@@ -42,8 +42,7 @@ class TarPlugin(binwalk.core.plugin.Plugin):
if result.description.lower().startswith('posix tar archive'): if result.description.lower().startswith('posix tar archive'):
is_tar = True is_tar = True
file_offset = result.offset file_offset = result.offset
fd = self.module.config.open_file( fd = self.module.config.open_file(result.file.name, offset=result.offset)
result.file.name, offset=result.offset)
while is_tar: while is_tar:
# read in the tar header struct # read in the tar header struct
...@@ -55,8 +54,7 @@ class TarPlugin(binwalk.core.plugin.Plugin): ...@@ -55,8 +54,7 @@ class TarPlugin(binwalk.core.plugin.Plugin):
# include header) # include header)
try: try:
size = self.nti(buf[124:136]) size = self.nti(buf[124:136])
blocks = math.ceil( blocks = math.ceil(size / float(self.TAR_BLOCKSIZE)) + 1
size / float(self.TAR_BLOCKSIZE)) + 1
except ValueError as e: except ValueError as e:
is_tar = False is_tar = False
break break
......
src/binwalk/plugins/ubivalid.py
...@@ -56,8 +56,7 @@ class UBIValidPlugin(binwalk.core.plugin.Plugin): ...@@ -56,8 +56,7 @@ class UBIValidPlugin(binwalk.core.plugin.Plugin):
def scan(self, result): def scan(self, result):
if result.file and result.description.lower().startswith('ubi erase count header'): if result.file and result.description.lower().startswith('ubi erase count header'):
# Seek to and read the suspected UBI erase count header # Seek to and read the suspected UBI erase count header
fd = self.module.config.open_file( fd = self.module.config.open_file(result.file.name, offset=result.offset)
result.file.name, offset=result.offset)
ec_header = binwalk.core.compat.str2bytes(fd.read(1024)) ec_header = binwalk.core.compat.str2bytes(fd.read(1024))
fd.close() fd.close()
......
src/binwalk/plugins/zlibextract.py
...@@ -28,8 +28,7 @@ class ZLIBExtractPlugin(binwalk.core.plugin.Plugin): ...@@ -28,8 +28,7 @@ class ZLIBExtractPlugin(binwalk.core.plugin.Plugin):
fpin = binwalk.core.common.BlockFile(fname) fpin = binwalk.core.common.BlockFile(fname)
fpout = binwalk.core.common.BlockFile(outfile, 'w') fpout = binwalk.core.common.BlockFile(outfile, 'w')
plaintext = zlib.decompress( plaintext = zlib.decompress(binwalk.core.compat.str2bytes(fpin.read()))
binwalk.core.compat.str2bytes(fpin.read()))
fpout.write(plaintext) fpout.write(plaintext)
fpin.close() fpin.close()
......
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