arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 14:28:07 +00:00
Code Issues Releases Wiki Activity

src: disable u2f in debug builds

Browse Source
This commit is contained in:
Pavol Rusnak 2018-02-09 16:45:36 +01:00
parent e888b6b967
commit e93ef0c296
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/main.py
View File

@ -18,43 +18,43 @@ usb_wire = io.WebUSB(
ep_out=0x01, ep_out=0x01,
) )
usb_u2f = io.HID(
iface_num=1,
ep_in=0x82,
ep_out=0x02,
report_desc=bytes([
0x06, 0xd0, 0xf1, # USAGE_PAGE (FIDO Alliance)
0x09, 0x01, # USAGE (U2F HID Authenticator Device)
0xa1, 0x01, # COLLECTION (Application)
0x09, 0x20, # USAGE (Input Report Data)
0x15, 0x00, # LOGICAL_MINIMUM (0)
0x26, 0xff, 0x00, # LOGICAL_MAXIMUM (255)
0x75, 0x08, # REPORT_SIZE (8)
0x95, 0x40, # REPORT_COUNT (64)
0x81, 0x02, # INPUT (Data,Var,Abs)
0x09, 0x21, # USAGE (Output Report Data)
0x15, 0x00, # LOGICAL_MINIMUM (0)
0x26, 0xff, 0x00, # LOGICAL_MAXIMUM (255)
0x75, 0x08, # REPORT_SIZE (8)
0x95, 0x40, # REPORT_COUNT (64)
0x91, 0x02, # OUTPUT (Data,Var,Abs)
0xc0, # END_COLLECTION
]),
)
if __debug__: if __debug__:
usb_debug = io.WebUSB( usb_debug = io.WebUSB(
iface_num=2, iface_num=1,
ep_in=0x85, ep_in=0x82,
ep_out=0x05, ep_out=0x02,
) )
usb_vcp = io.VCP( usb_vcp = io.VCP(
iface_num=3, iface_num=2,
data_iface_num=4, data_iface_num=3,
ep_in=0x83, ep_in=0x83,
ep_out=0x03, ep_out=0x03,
ep_cmd=0x84, ep_cmd=0x84,
) )
else:
usb_u2f = io.HID(
iface_num=1,
ep_in=0x82,
ep_out=0x02,
report_desc=bytes([
0x06, 0xd0, 0xf1, # USAGE_PAGE (FIDO Alliance)
0x09, 0x01, # USAGE (U2F HID Authenticator Device)
0xa1, 0x01, # COLLECTION (Application)
0x09, 0x20, # USAGE (Input Report Data)
0x15, 0x00, # LOGICAL_MINIMUM (0)
0x26, 0xff, 0x00, # LOGICAL_MAXIMUM (255)
0x75, 0x08, # REPORT_SIZE (8)
0x95, 0x40, # REPORT_COUNT (64)
0x81, 0x02, # INPUT (Data,Var,Abs)
0x09, 0x21, # USAGE (Output Report Data)
0x15, 0x00, # LOGICAL_MINIMUM (0)
0x26, 0xff, 0x00, # LOGICAL_MAXIMUM (255)
0x75, 0x08, # REPORT_SIZE (8)
0x95, 0x40, # REPORT_COUNT (64)
0x91, 0x02, # OUTPUT (Data,Var,Abs)
0xc0, # END_COLLECTION
]),
)
usb = io.USB( usb = io.USB(
vendor_id=0x1209, vendor_id=0x1209,
@ -67,28 +67,31 @@ usb = io.USB(
) )
usb.add(usb_wire) usb.add(usb_wire)
usb.add(usb_u2f)
if __debug__: if __debug__:
usb.add(usb_debug) usb.add(usb_debug)
usb.add(usb_vcp) usb.add(usb_vcp)
else:
usb.add(usb_u2f)
# load applications # load applications
if __debug__:
from apps import debug
from apps import homescreen from apps import homescreen
from apps import management from apps import management
from apps import wallet from apps import wallet
from apps import ethereum from apps import ethereum
from apps import fido_u2f if __debug__:
from apps import debug
else:
from apps import fido_u2f
# boot applications # boot applications
if __debug__:
debug.boot()
homescreen.boot() homescreen.boot()
management.boot() management.boot()
wallet.boot() wallet.boot()
ethereum.boot() ethereum.boot()
fido_u2f.boot(usb_u2f) if __debug__:
debug.boot()
else:
fido_u2f.boot(usb_u2f)
# initialize the wire codec and start the USB # initialize the wire codec and start the USB
wire.setup(usb_wire) wire.setup(usb_wire)