diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/basedetection.py | 13 | ||||
| -rw-r--r-- | python/examples/raw_binary_base_detection.py | 7 |
2 files changed, 13 insertions, 7 deletions
diff --git a/python/basedetection.py b/python/basedetection.py index f3cc3eb9..73970df5 100644 --- a/python/basedetection.py +++ b/python/basedetection.py @@ -26,6 +26,7 @@ from dataclasses import dataclass from .enums import BaseAddressDetectionPOIType, BaseAddressDetectionConfidence, BaseAddressDetectionPOISetting from .binaryview import BinaryView from . import _binaryninjacore as core +from . import architecture @dataclass @@ -160,7 +161,7 @@ class BaseAddressDetection: def detect_base_address( self, - arch: Optional[str] = "", + arch: Optional[Union['architecture.Architecture', str]] = None, analysis: Optional[Literal["basic", "controlFlow", "full"]] = "full", min_strlen: Optional[int] = 10, alignment: Optional[int] = 1024, @@ -175,7 +176,7 @@ class BaseAddressDetection: .. note:: This operation can take a long time to complete depending on the size and complexity of the binary \ and the settings used - :param str arch: CPU architecture of the binary (defaults to using auto-detection) + :param Architecture arch: CPU architecture of the binary (defaults to using auto-detection) :param str analysis: analysis mode (``basic``, ``controlFlow``, or ``full``) :param int min_strlen: minimum length of a string to be considered a point-of-interest :param int alignment: byte boundary to align the base address to while brute-forcing @@ -187,8 +188,11 @@ class BaseAddressDetection: :rtype: bool """ + if isinstance(arch, str): + arch = architecture.Architecture[arch] + if not arch and self._view_arch: - arch = str(self._view_arch) + arch = self._view_arch if analysis not in ["basic", "controlFlow", "full"]: raise ValueError("invalid analysis setting") @@ -202,8 +206,9 @@ class BaseAddressDetection: if high_boundary < low_boundary: raise ValueError("upper boundary must be greater than lower boundary") + archname = arch.name if arch else "" settings = core.BNBaseAddressDetectionSettings( - arch.encode(), + archname.encode(), analysis.encode(), min_strlen, alignment, diff --git a/python/examples/raw_binary_base_detection.py b/python/examples/raw_binary_base_detection.py index b584903c..1180b672 100644 --- a/python/examples/raw_binary_base_detection.py +++ b/python/examples/raw_binary_base_detection.py @@ -25,7 +25,7 @@ raw position-dependent firmware binaries import argparse import json from os import walk, path -from binaryninja import BaseAddressDetection, log_to_stderr, LogLevel, log_info, log_error +from binaryninja import BaseAddressDetection, log_to_stderr, LogLevel, log_info, log_error, Architecture def _get_directory_listing(_path: str) -> list[str]: @@ -48,7 +48,7 @@ def _parse_args() -> argparse.Namespace: parser.add_argument("--debug", action="store_true", help="enable debug logging") parser.add_argument("--reasons", action="store_true", help="show reasons for base address selection") parser.add_argument("--analysis", type=str, help="analysis level", default="full") - parser.add_argument("--arch", type=str, default="", help="architecture of the binary") + parser.add_argument("--arch", type=str, help="architecture of the binary") return parser.parse_args() @@ -68,7 +68,8 @@ def main() -> None: for _file in files: log_info(f"Running base address detection analysis on '{_file}'...") bad = BaseAddressDetection(_file) - if not bad.detect_base_address(analysis=args.analysis, arch=args.arch): + arch = Architecture[args.arch] if args.arch else None + if not bad.detect_base_address(analysis=args.analysis, arch=arch): log_error("Base address detection analysis failed") continue |