Merge branch 'main' into main

Author: RobinDavid

pyproject.toml

@@ -8,7 +8,7 @@ description = "Python wrapper to manipulate bindiff files"
 authors = [{ name = "Robin David", email = "[email protected]" }]
 license = { text = "Apache Software License (Apache License, Version 2)" }
 readme = { file = "README.md", content-type = "text/markdown" }
-version = '0.3.1'
+version = '0.3.2'
 requires-python = ">=3.9"
 dependencies = [
     "python-magic; os_name!='nt'",

src/bindiff/__main__.py

@@ -42,9 +42,9 @@
     help="BinDiff differ directory",
 )
 @click.option("-o", "--output", type=click.Path(), default=None, help="Output file matching")
-@click.argument("primary", type=click.Path(exists=True), metavar="<primary file>")
-@click.argument("secondary", type=click.Path(exists=True), metavar="<secondary file>")
-def main(ida_path: str, bindiff_path: str, output: str, primary: str, secondary: str) -> None:
+@click.argument("primary", type=click.Path(exists=True, path_type=Path), metavar="<primary file>")
+@click.argument("secondary", type=click.Path(exists=True, path_type=Path), metavar="<secondary file>")
+def main(ida_path: str, bindiff_path: str, output: str, primary: Path, secondary: Path) -> None:
     """
     bindiffer is a very simple utility to diff two binary files using BinDiff
     in command line. The two input files can be either binary files (in which
@@ -79,9 +79,6 @@ def main(ida_path: str, bindiff_path: str, output: str, primary: str, secondary:
         logging.error("Output file name is too long (%s).", output)
         exit(1)
 
-    primary = Path(primary)
-    secondary = Path(secondary)
-
     if not (primary.suffix == ".BinExport" and secondary.suffix == ".BinExport"):
         for file in [primary, secondary]:
             mime_type = magic.from_file(file, mime=True)
@@ -95,11 +92,11 @@ def main(ida_path: str, bindiff_path: str, output: str, primary: str, secondary:
 
         # Export each binary separately (and then diff to be able to print it)
         logging.info(f"export primary: {primary}.BinExport")
-        ProgramBinExport.from_binary_file(primary, open_export=False, override=True)
+        ProgramBinExport.generate(primary, override=True)
         primary = Path(str(primary) + ".BinExport")
 
         logging.info(f"export secondary: {secondary}.BinExport")
-        ProgramBinExport.from_binary_file(secondary, open_export=False, override=True)
+        ProgramBinExport.generate(secondary, override=True)
         secondary = Path(str(secondary) + ".BinExport")
 
     logging.info("start diffing")

src/bindiff/bindiff.py

@@ -134,9 +134,9 @@ def iter_function_matches(
         matches = []
         for match in self.primary_functions_match.values():
             if match.address1 not in self.primary:
-                logging.error(f"missing primary function match at '{hex(match.address1)}'")
+                logging.error(f"missing primary function match at: {match.address1:#08x}")
             elif match.address2 not in self.secondary:
-                logging.error(f"missing secondary function match at '{hex(match.address1)}'")
+                logging.error(f"missing secondary function match at: {match.address1:#08x}")
             else:
                 matches.append(
                     (self.primary[match.address1], self.secondary[match.address2], match)
@@ -305,7 +305,8 @@ def raw_diffing(p1_path: Union[Path, str], p2_path: Union[Path, str], out_diff:
         if not f2.exists():
             logging.error(f"file '{p2_path}' doesn't exist")
             return False
-
+            
+        assert BINDIFF_BINARY is not None  # for mypy
         cmd_line = [
             BINDIFF_BINARY.as_posix(),
             f"--primary={p1_path}",
@@ -355,8 +356,8 @@ def from_binary_files(
         :return: BinDiff object representing the diff
         """
 
-        p1 = ProgramBinExport.from_binary_file(p1_path, override=override)
-        p2 = ProgramBinExport.from_binary_file(p2_path, override=override)
+        p1 = ProgramBinExport.from_binary(p1_path, override=override)
+        p2 = ProgramBinExport.from_binary(p2_path, override=override)
         if p1 and p2:
             return BinDiff.from_binexport_files(p1, p2, diff_out, override=override)
         else: