merge from master, sorry

This commit is contained in:
William Ballenthin
2021-03-05 11:06:40 -07:00
15 changed files with 167 additions and 39 deletions

View File

@@ -100,7 +100,7 @@ def main(argv=None):
extractor = capa.features.freeze.load(f.read())
else:
try:
extractor = capa.main.get_extractor(args.sample, args.format)
extractor = capa.main.get_extractor(args.sample, args.format, capa.main.BACKEND_VIV)
except capa.main.UnsupportedFormatError:
logger.error("-" * 80)
logger.error(" Input file does not appear to be a PE file.")