Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2119 issue: use bytes.fromhex instead of binascii #2235

Merged
merged 4 commits into from
Aug 9, 2024
Merged

#2119 issue: use bytes.fromhex instead of binascii #2235

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f93cc2b
#2119 issue: use bytes.fromhex instead of binascii
lakshayletsgo Jul 28, 2024
e42c04a
Merge branch 'master' into lakshay/#2119_issue
lakshayletsgo Jul 30, 2024
f83100e
Update capa/rules/__init__.py
lakshayletsgo Jul 30, 2024
3dd79d0
remove unneeded codecs import
mr-tz Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions capa/rules/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import re
import copy
import uuid
import codecs
import logging
import binascii
import collections
Expand Down Expand Up @@ -456,7 +455,7 @@ def parse_feature(key: str):

def parse_bytes(s: str) -> bytes:
try:
b = codecs.decode(s.replace(" ", "").encode("ascii"), "hex")
b = bytes.fromhex(s.replace(" ", ""))
except binascii.Error:
raise InvalidRule(f'unexpected bytes value: must be a valid hex sequence: "{s}"')

Expand Down