Merge pull request #3 from quarkslab/update_binexport

Add .gitignore, switch to pyproject.toml and update binexport to v0.2.0
quarkslab · Nov 15, 2023 · 16ddcff · 16ddcff
2 parents ed9e72f + 9617624
commit 16ddcff
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,13 @@
+# Distribution / packaging
+.Python
+build/
+*.egg-info/
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,31 @@
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "python-bindiff"
+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.1.5'
+requires-python = ">=3.9"
+dependencies = ['python-magic', 'click', 'python-binexport>=0.2.0']
+classifiers = [
+    'Topic :: Security',
+    'Environment :: Console',
+    'Operating System :: OS Independent',
+]
+
+[project.urls]
+Homepage = "https://github.com/quarkslab/python-bindiff"
+Repository = "https://github.com/quarkslab/python-bindiff"
+Documentation = "https://diffing.quarkslab.com/differs/bindiff.html#python-bindiff"
+"Bug Tracker" = "https://github.com/quarkslab/python-bindiff/issues"
+
+[tools.setuptools]
+script-files = ["bins/bindiffer"]
+
+[tool.black]
+line-length = 100
+target-version = ['py310']
diff --git a/setup.py b/setup.py
diff --git a/bindiff/__init__.py → src/bindiff/__init__.py b/bindiff/__init__.py → src/bindiff/__init__.py
diff --git a/bindiff/bindiff.py → src/bindiff/bindiff.py b/bindiff/bindiff.py → src/bindiff/bindiff.py
@@ -107,7 +107,7 @@ def _convert_program_classes(p: ProgramBinExport) -> None:
             f.__class__ = FunctionBinDiff
             for bb in f.values():
                 bb.__class__ = BasicBlockBinDiff
-                for i in bb.values():
+                for i in bb.uncached_instructions.values():
                     i.__class__ = InstructionBinDiff
 
     def _map_diff_on_programs(self) -> None:
@@ -145,7 +145,7 @@ def _map_diff_on_programs(self) -> None:
                         bb_f1.algorithhm = bb_f2.algorithm = bb_match.algorithm
 
                         # Iterate instructions to map them
-                        for ins_f1 in bb_f1.values():
+                        for ins_f1 in bb_f1.uncached_instructions.values():
                             # Instruction is matched
                             if ins_f1.addr in self.primary_instruction_match:
                                 # Within the context of the current function

diff --git a/bindiff/file.py → src/bindiff/file.py b/bindiff/file.py → src/bindiff/file.py
diff --git a/bindiff/types.py → src/bindiff/types.py b/bindiff/types.py → src/bindiff/types.py