diff --git a/python/requirements.txt b/python/requirements.txt index b95d98957..9b4ffe82e 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -5,5 +5,4 @@ click>=7,<9 libusb1>=1.6.4 construct>=2.9,!=2.10.55 typing_extensions>=3.7.4 -pyblake2>=0.9.3 ; python_version<'3.6' attrs diff --git a/python/setup.py b/python/setup.py index 425310240..0c030a05f 100755 --- a/python/setup.py +++ b/python/setup.py @@ -13,7 +13,6 @@ install_requires = [ "libusb1>=1.6.4", "construct>=2.9", "typing_extensions>=3.7.4", - "pyblake2>=0.9.3 ; python_version<'3.6'", "attrs", ] diff --git a/python/src/trezorlib/_internal/firmware_headers.py b/python/src/trezorlib/_internal/firmware_headers.py index db78da240..e8db51e70 100644 --- a/python/src/trezorlib/_internal/firmware_headers.py +++ b/python/src/trezorlib/_internal/firmware_headers.py @@ -1,5 +1,6 @@ import struct from enum import Enum +from hashlib import blake2s from typing import Any, List, Optional import click @@ -7,12 +8,6 @@ import construct as c from .. import cosi, firmware -try: - from hashlib import blake2s -except ImportError: - from pyblake2 import blake2s - - SYM_OK = click.style("\u2714", fg="green") SYM_FAIL = click.style("\u274c", fg="red") diff --git a/python/src/trezorlib/firmware.py b/python/src/trezorlib/firmware.py index 64d958308..f7e8049b2 100644 --- a/python/src/trezorlib/firmware.py +++ b/python/src/trezorlib/firmware.py @@ -16,6 +16,7 @@ import hashlib from enum import Enum +from hashlib import blake2s from typing import Callable, List, Tuple import construct as c @@ -23,12 +24,6 @@ import ecdsa from . import cosi, messages, tools -try: - from hashlib import blake2s -except ImportError: - from pyblake2 import blake2s - - V1_SIGNATURE_SLOTS = 3 V1_BOOTLOADER_KEYS = [ bytes.fromhex(key)