This commit is contained in:
William Ballenthin
2021-10-26 15:21:28 -06:00
parent a1075b63ec
commit 4451b76f89
4 changed files with 2 additions and 5 deletions
-1
View File
@@ -140,7 +140,6 @@ def collect_metadata():
#
# "functions": { 0x401000: { "matched_basic_blocks": [ 0x401000, 0x401005, ... ] }, ... }
},
},
"version": capa.version.__version__,
}
-1
View File
@@ -629,7 +629,6 @@ def compute_layout(rules, extractor, capabilities):
}
return layout
def install_common_args(parser, wanted=None):
+2 -2
View File
@@ -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)
-1
View File
@@ -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"]