Commit 5dff8a31 by devttys0

Fixed --magic option bug.

parent 6b0a85ac
...@@ -13,7 +13,7 @@ class Signature(Module): ...@@ -13,7 +13,7 @@ class Signature(Module):
CLI = [ CLI = [
Option(short='B', Option(short='B',
long='signature', long='signature',
kwargs={'enabled' : True, 'force_default_scan' : True}, kwargs={'enabled' : True},
description='Scan target file(s) for common file signatures'), description='Scan target file(s) for common file signatures'),
Option(short='R', Option(short='R',
long='raw', long='raw',
...@@ -46,7 +46,6 @@ class Signature(Module): ...@@ -46,7 +46,6 @@ class Signature(Module):
Kwarg(name='search_for_opcodes', default=False), Kwarg(name='search_for_opcodes', default=False),
Kwarg(name='cast_data_types', default=False), Kwarg(name='cast_data_types', default=False),
Kwarg(name='dumb_scan', default=False), Kwarg(name='dumb_scan', default=False),
Kwarg(name='force_default_scan', default=False),
Kwarg(name='magic_files', default=[]), Kwarg(name='magic_files', default=[]),
] ]
...@@ -75,7 +74,7 @@ class Signature(Module): ...@@ -75,7 +74,7 @@ class Signature(Module):
] ]
# Use the system default magic file if no other was specified, or if -B was explicitly specified # Use the system default magic file if no other was specified, or if -B was explicitly specified
elif not self.magic_files or self.force_default_scan: elif not self.magic_files:
self.magic_files = [ self.magic_files = [
self.config.settings.get_file_path('user', self.config.settings.BINWALK_MAGIC_FILE), self.config.settings.get_file_path('user', self.config.settings.BINWALK_MAGIC_FILE),
self.config.settings.get_file_path('system', self.config.settings.BINWALK_MAGIC_FILE), self.config.settings.get_file_path('system', self.config.settings.BINWALK_MAGIC_FILE),
......
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