jacobpascual/trezor-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a few pycodestyle & pystyle issues

Browse Source
This commit is contained in:
Roman Zeyde
2023-02-04 18:41:54 +02:00
parent 2e61c84ca6
commit a9bcabc664
8 changed files with 46 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libagent/device/ledger.py
View File

@@ -36,11 +36,13 @@ def _convert_public_key(ecdsa_curve_name, result):
class LedgerNanoS(interface.Device):
"""Connection to Ledger Nano S device."""
LEDGER_APP_NAME = "SSH/PGP Agent"
ledger_app_version = None
ledger_app_supports_end_of_frame_byte = True
def get_app_name_and_version(self, dongle):
"""Retrieve currently running Ledger application name and its version string."""
device_version_answer = dongle.exchange(binascii.unhexlify('B001000000'))
offset = 1
app_name_length = struct.unpack_from("B", device_version_answer, offset)[0]
@@ -50,7 +52,7 @@ class LedgerNanoS(interface.Device):
app_version_length = struct.unpack_from("B", device_version_answer, offset)[0]
offset += 1
app_version = device_version_answer[offset: offset + app_version_length]
log.debug("running app {}, version {}".format(app_name, app_version))
log.debug("running app %s, version %s", app_name, app_version)
return (app_name.decode(), app_version.decode())
@classmethod
@@ -64,13 +66,13 @@ class LedgerNanoS(interface.Device):
dongle = comm.getDongle(debug=True)
(app_name, self.ledger_app_version) = self.get_app_name_and_version(dongle)
self.ledger_app_version = self.ledger_app_version.split(".")
if self.ledger_app_version[0] == "0" and self.ledger_app_version[1] == "0" and int(self.ledger_app_version[2]) <= 7:
version_parts = self.ledger_app_version.split(".")
if (version_parts[0] == "0" and version_parts[1] == "0" and int(version_parts[2]) <= 7):
self.ledger_app_supports_end_of_frame_byte = False
if app_name != LedgerNanoS.LEDGER_APP_NAME:
# we could launch the app here if we are in the dashboard
raise interface.DeviceError('{} is not running {}'.format(self, LedgerNanoS.LEDGER_APP_NAME))
raise interface.DeviceError(f'{self} is not running {LedgerNanoS.LEDGER_APP_NAME}')
return dongle
except comm.CommException as e:
@@ -98,6 +100,7 @@ class LedgerNanoS(interface.Device):
def sign(self, identity, blob):
"""Sign given blob and return the signature (as bytes)."""
# pylint: disable=too-many-locals,too-many-branches
path = _expand_path(identity.get_bip32_address(ecdh=False))
offset = 0
result = None
@@ -106,7 +109,7 @@ class LedgerNanoS(interface.Device):
if offset == 0:
data += bytearray([len(path) // 4]) + path
chunk_size = min(len(blob) - offset, 255 - len(data))
data += blob[offset : offset + chunk_size]
data += blob[offset:offset + chunk_size]
if identity.identity_dict['proto'] == 'ssh':
ins = '04'
@@ -120,8 +123,8 @@ class LedgerNanoS(interface.Device):
if offset == 0:
p1 = "00"
elif ((offset + chunk_size) == len(blob)) and self.ledger_app_supports_end_of_frame_byte:
p1 = "81" # end of frame byte only handled in 0.0.8+
elif offset + chunk_size == len(blob) and self.ledger_app_supports_end_of_frame_byte:
p1 = "81" # end of frame byte only handled in 0.0.8+
else:
p1 = "01"

2
libagent/device/onlykey.py
View File

@@ -289,7 +289,7 @@ class OnlyKey(interface.Device):
log.info('received= %s', repr(result))
return bytes(result)
raise Exception('failed to sign challenge')
raise interface.Error('failed to sign challenge')
def ecdh(self, identity, pubkey):
"""Get shared session key using Elliptic Curve Diffie-Hellman."""