Merge pull request #92 from unk0unk0unk0/master

Updated ironstrings to work with Python3.
mandiant · Jul 9, 2020 · 4a233d4 · 4a233d4
2 parents babf20f + 46ac7bb
commit 4a233d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/python/flare/ironstrings/ironstrings.py b/python/flare/ironstrings/ironstrings.py
@@ -159,14 +159,14 @@ def main():
             cnt_analyzed += 1
 
             # print stackstrings found in this function
-            f_ss = filter(lambda s: s.fva == fva, userData["stackstrings"])
+            f_ss = list(filter(lambda s: s.fva == fva, userData["stackstrings"]))
             cnt_found_ss += len(f_ss)
             for ss in sorted(f_ss, key=lambda s: s.written_at):
                 print_string(ss.fva, ss.written_at, ss.offset, ss.s)
                 # IMPROVEMENT adjust stack frame member size in IDA view
 
             # print globalstrings found in this function
-            f_gs = filter(lambda g: g.fva == fva, userData["globalstrings"])
+            f_gs = list(filter(lambda g: g.fva == fva, userData["globalstrings"]))
             cnt_found_ss += len(f_gs)
             for gs in sorted(f_gs, key=lambda g: g.written_at):
                 print_string(gs.fva, gs.written_at, gs.offset, gs.s)

diff --git a/python/flare/ironstrings/strings.py b/python/flare/ironstrings/strings.py
@@ -7,9 +7,9 @@
 from collections import namedtuple
 
 
-ASCII_BYTE = " !\"#\$%&\'\(\)\*\+,-\./0123456789:;<=>\?@ABCDEFGHIJKLMNOPQRSTUVWXYZ\[\]\^_`abcdefghijklmnopqrstuvwxyz\{\|\}\\\~\t"
-ASCII_RE_4 = re.compile("([%s]{%d,})" % (ASCII_BYTE, 4))
-UNICODE_RE_4 = re.compile(b"((?:[%s]\x00){%d,})" % (ASCII_BYTE, 4))
+ASCII_BYTE = r" !\"#\$%&\'\(\)\*\+,-\./0123456789:;<=>\?@ABCDEFGHIJKLMNOPQRSTUVWXYZ\[\]\^_`abcdefghijklmnopqrstuvwxyz\{\|\}\\\~\t"
+ASCII_RE_4 = re.compile(b"([%s]{%d,})" % (ASCII_BYTE.encode("ascii"), 4))
+UNICODE_RE_4 = re.compile(b"((?:[%s]\x00){%d,})" % (ASCII_BYTE.encode("ascii"), 4))
 REPEATS = ["A", "\x00", "\xfe", "\xff"]
 SLICE_SIZE = 4096