gitea-mirror/capa
1
0
Fork 0
mirror of https://github.com/mandiant/capa.git synced 2026-01-19 08:01:05 -08:00
Code Issues Packages Projects Releases Wiki Activity

render: emit bytes uppercase, separated

Browse Source
This commit is contained in:
William Ballenthin
2020-06-28 09:31:15 -06:00
parent 9be448a900
commit 4c4b538a6a
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
capa/features/__init__.py
View File

@@ -106,7 +106,7 @@ class Bytes(Feature):
def freeze_serialize(self):
return (self.__class__.__name__,
map(lambda x: codecs.encode(x, 'hex'), self.args))
map(lambda x: codecs.encode(x, 'hex').upper(), self.args))
@classmethod
def freeze_deserialize(cls, args):

8
capa/render/vverbose.py
View File

@@ -34,10 +34,16 @@ def render_statement(ostream, statement, indent=0):
def render_feature(ostream, match, feature, indent=0):
ostream.write(' ' * indent)
if feature['type'] in ('string', 'bytes', 'api', 'number', 'offset', 'mnemonic', 'basic block', 'export', 'import', 'section', 'match'):
if feature['type'] in ('string', 'api', 'number', 'offset', 'mnemonic', 'basic block', 'export', 'import', 'section', 'match'):
ostream.write(feature['type'])
ostream.write(': ')
ostream.write(rutils.bold2(feature[feature['type']]))
elif feature['type'] == 'bytes':
ostream.write('bytes: ')
bytes = feature['bytes']
for i in range(len(bytes)//2):
ostream.write(rutils.bold2(bytes[i:i + 2]))
ostream.write(' ')
elif feature['type'] == 'characteristic':
ostream.write('characteristic(%s)' % (rutils.bold2(feature['characteristic'][0])))
# note that regex is found in `render_statement`