diff --git a/capa/ida/helpers.py b/capa/ida/helpers.py index 67ea52a1..291c4cf2 100644 --- a/capa/ida/helpers.py +++ b/capa/ida/helpers.py @@ -140,7 +140,6 @@ def collect_metadata(): # # "functions": { 0x401000: { "matched_basic_blocks": [ 0x401000, 0x401005, ... ] }, ... } }, - }, "version": capa.version.__version__, } diff --git a/capa/main.py b/capa/main.py index 0c9f7e9f..a58e3904 100644 --- a/capa/main.py +++ b/capa/main.py @@ -629,7 +629,6 @@ def compute_layout(rules, extractor, capabilities): } return layout - def install_common_args(parser, wanted=None): diff --git a/scripts/capa_as_library.py b/scripts/capa_as_library.py index a9f5e028..9b79ed49 100644 --- a/scripts/capa_as_library.py +++ b/scripts/capa_as_library.py @@ -165,11 +165,11 @@ def render_dictionary(doc): def capa_details(file_path, output_format="dictionary"): # collect metadata (used only to make rendering more complete) meta = capa.main.collect_metadata("", file_path, RULES_PATH, extractor) - + # extract features and find capabilities extractor = capa.main.get_extractor(file_path, "auto", capa.main.BACKEND_VIV, [], False, disable_progress=True) capabilities, counts = capa.main.find_capabilities(rules, extractor, disable_progress=True) - + meta["analysis"].update(counts) meta["analysis"]["layout"] = capa.main.compute_layout(rules, extractor, capabilities) diff --git a/tests/test_main.py b/tests/test_main.py index 25a62c1f..796680f1 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -385,4 +385,3 @@ def test_json_meta(capsys): # remember: json can't have integer keys :-( assert str(0x10001010) in std_json["meta"]["analysis"]["layout"]["functions"] assert 0x10001179 in std_json["meta"]["analysis"]["layout"]["functions"][str(0x10001010)]["matched_basic_blocks"] -