Skip to content

Commit 946f9ab

Browse files
onlykeyonlykey
authored andcommitted
support for beta 8
1 parent 2010709 commit 946f9ab

3 files changed

Lines changed: 18 additions & 13 deletions

File tree

onlykey/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ def prompt_pin():
303303
else:
304304

305305
# Print help.
306-
print('OnlyKey CLI v0.6')
306+
print('OnlyKey CLI v1.0.1')
307307
print('Control-D to exit.')
308308
print()
309309

onlykey/client.py

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -171,17 +171,22 @@ def _connect(self):
171171
# self._hid.enumerate
172172
# self._hid.open(ID_VENDOR, ID_PRODUCT)
173173
for d in hid.enumerate(0, 0):
174-
vendor_id = d['vendor_id']
175-
product_id = d['product_id']
176-
serial_number = d['serial_number']
177-
interface_number = d['interface_number']
178-
usage_page = d['usage_page']
179-
path = d['path']
180-
181-
if (vendor_id, product_id) in DEVICE_IDS:
182-
if usage_page == 0xf1d0 or interface_number == 1:
183-
self._hid.open_path(path)
184-
self._hid.set_nonblocking(True)
174+
vendor_id = d['vendor_id']
175+
product_id = d['product_id']
176+
serial_number = d['serial_number']
177+
interface_number = d['interface_number']
178+
usage_page = d['usage_page']
179+
path = d['path']
180+
181+
if (vendor_id, product_id) in DEVICE_IDS:
182+
if serial_number == '1000000000':
183+
if usage_page == 0xffab or interface_number == 2:
184+
self._hid.open_path(path)
185+
self._hid.set_nonblocking(True)
186+
else:
187+
if usage_page == 0xf1d0 or interface_number == 1:
188+
self._hid.open_path(path)
189+
self._hid.set_nonblocking(True)
185190

186191
except:
187192
log.exception('failed to connect')

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
setup(
1212
name='onlykey',
13-
version='0.6',
13+
version='1.0.1',
1414
description='OnlyKey client and command-line tool',
1515
long_description=long_description,
1616
url='https://github.com/trustcrypto/python-onlykey',

0 commit comments

Comments
 (0)