From 1f6cc77decd4839bb84cad86fa52251cf68785ed Mon Sep 17 00:00:00 2001 From: matejcik Date: Wed, 20 Nov 2019 16:02:47 +0100 Subject: [PATCH] upgrade black to 19.10b0 --- Pipfile.lock | 6 +++--- core/src/apps/common/sd_salt.py | 2 +- core/src/apps/webauthn/fido2.py | 4 +--- core/src/trezor/crypto/slip39.py | 22 +++++++++++++++------- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 1c599439e..37c83d481 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -45,11 +45,11 @@ }, "black": { "hashes": [ - "sha256:09a9dcb7c46ed496a9850b76e4e825d6049ecd38b611f1224857a79bd985a8cf", - "sha256:68950ffd4d9169716bcb8719a56c07a2f4485354fec061cdd5910aa07369731c" + "sha256:1b30e59be925fafc1ee4565e5e08abef6b03fe455102883820fe5ee2e4734e0b", + "sha256:c2edb73a08e9e0e6f65a0e6af18b059b8b1cdd5bef997d7a0b181df93dc81539" ], "index": "pypi", - "version": "==19.3b0" + "version": "==19.10b0" }, "certifi": { "hashes": [ diff --git a/core/src/apps/common/sd_salt.py b/core/src/apps/common/sd_salt.py index 7b852fc75..aa43a45a0 100644 --- a/core/src/apps/common/sd_salt.py +++ b/core/src/apps/common/sd_salt.py @@ -59,7 +59,7 @@ async def ensure_sd_card(ctx: wire.GenericContext) -> None: async def request_sd_salt( - ctx: wire.GenericContext = wire.DUMMY_CONTEXT + ctx: wire.GenericContext = wire.DUMMY_CONTEXT, ) -> Optional[bytearray]: if not storage.sd_salt.is_enabled(): return None diff --git a/core/src/apps/webauthn/fido2.py b/core/src/apps/webauthn/fido2.py index 797938f29..5387091f4 100644 --- a/core/src/apps/webauthn/fido2.py +++ b/core/src/apps/webauthn/fido2.py @@ -176,9 +176,7 @@ _U2F_REGISTER_ID = const(0x05) # version 2 registration identifier _U2F_ATT_PRIV_KEY = b"q&\xac+\xf6D\xdca\x86\xad\x83\xef\x1f\xcd\xf1*W\xb5\xcf\xa2\x00\x0b\x8a\xd0'\xe9V\xe8T\xc5\n\x8b" _U2F_ATT_CERT = b"0\x82\x01\x180\x81\xc0\x02\t\x00\xb1\xd9\x8fBdr\xd3,0\n\x06\x08*\x86H\xce=\x04\x03\x020\x151\x130\x11\x06\x03U\x04\x03\x0c\nTrezor U2F0\x1e\x17\r160429133153Z\x17\r260427133153Z0\x151\x130\x11\x06\x03U\x04\x03\x0c\nTrezor U2F0Y0\x13\x06\x07*\x86H\xce=\x02\x01\x06\x08*\x86H\xce=\x03\x01\x07\x03B\x00\x04\xd9\x18\xbd\xfa\x8aT\xac\x92\xe9\r\xa9\x1f\xcaz\xa2dT\xc0\xd1s61M\xde\x83\xa5K\x86\xb5\xdfN\xf0Re\x9a\x1do\xfc\xb7F\x7f\x1a\xcd\xdb\x8a3\x08\x0b^\xed\x91\x89\x13\xf4C\xa5&\x1b\xc7{h`o\xc10\n\x06\x08*\x86H\xce=\x04\x03\x02\x03G\x000D\x02 $\x1e\x81\xff\xd2\xe5\xe6\x156\x94\xc3U.\x8f\xeb\xd7\x1e\x895\x92\x1c\xb4\x83ACq\x1cv\xea\xee\xf3\x95\x02 _\x80\xeb\x10\xf2\\\xcc9\x8b<\xa8\xa9\xad\xa4\x02\x7f\x93\x13 w\xb7\xab\xcewFZ'\xf5=3\xa1\x1d" _BOGUS_APPID = b"AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" -_AAGUID = ( - b"\xd6\xd0\xbd\xc3b\xee\xc4\xdb\xde\x8dzenJD\x87" -) # First 16 bytes of SHA-256("TREZOR 2") +_AAGUID = b"\xd6\xd0\xbd\xc3b\xee\xc4\xdb\xde\x8dzenJD\x87" # First 16 bytes of SHA-256("TREZOR 2") _BOGUS_PRIV_KEY = b"\xAA" * 32 # authentication control byte diff --git a/core/src/trezor/crypto/slip39.py b/core/src/trezor/crypto/slip39.py index 9a94e3b0b..2b869670a 100644 --- a/core/src/trezor/crypto/slip39.py +++ b/core/src/trezor/crypto/slip39.py @@ -263,9 +263,13 @@ def combine_mnemonics(mnemonics: List[str]) -> Tuple[int, int, bytes, int]: if not mnemonics: raise MnemonicError("The list of mnemonics is empty.") - identifier, iteration_exponent, group_threshold, group_count, groups = _decode_mnemonics( - mnemonics - ) + ( + identifier, + iteration_exponent, + group_threshold, + group_count, + groups, + ) = _decode_mnemonics(mnemonics) if len(groups) != group_threshold: raise MnemonicError( @@ -316,9 +320,13 @@ def decode_mnemonic(mnemonic: str) -> Share: tmp = _int_from_indices( mnemonic_data[_ID_EXP_LENGTH_WORDS : _ID_EXP_LENGTH_WORDS + 2] ) - group_index, group_threshold, group_count, member_index, member_threshold = _int_to_indices( - tmp, 5, 4 - ) + ( + group_index, + group_threshold, + group_count, + member_index, + member_threshold, + ) = _int_to_indices(tmp, 5, 4) value_data = mnemonic_data[_ID_EXP_LENGTH_WORDS + 2 : -_CHECKSUM_LENGTH_WORDS] if group_count < group_threshold: @@ -585,7 +593,7 @@ def _encode_mnemonic( def _decode_mnemonics( - mnemonics: List[str] + mnemonics: List[str], ) -> Tuple[int, int, int, int, MnemonicGroups]: identifiers = set() iteration_exponents = set()