From: Sergey Matveev Date: Mon, 17 Feb 2020 12:12:00 +0000 (+0300) Subject: Use bytes joining for three elements X-Git-Tag: 7.2~7 X-Git-Url: http://www.git.cypherpunks.ru/?p=pyderasn.git;a=commitdiff_plain;h=68a34f95b62f57b1b5395d8a965d96ecfc7a43e9 Use bytes joining for three elements --- diff --git a/pyderasn.py b/pyderasn.py index 2dee544..303018d 100755 --- a/pyderasn.py +++ b/pyderasn.py @@ -2704,11 +2704,11 @@ class Integer(Obj): def __hash__(self): self._assert_ready() - return hash( - self.tag + - bytes(self._expl or b"") + + return hash(b"".join(( + self.tag, + bytes(self._expl or b""), str(self._value).encode("ascii"), - ) + ))) def __eq__(self, their): if isinstance(their, integer_types): @@ -4201,11 +4201,11 @@ class ObjectIdentifier(Obj): def __hash__(self): self._assert_ready() - return hash( - self.tag + - bytes(self._expl or b"") + + return hash(b"".join(( + self.tag, + bytes(self._expl or b""), str(self._value).encode("ascii"), - ) + ))) def __eq__(self, their): if their.__class__ == tuple: