shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Update solotool.py

Browse Source
This commit is contained in:
Conor Patrick 2019-01-26 17:15:40 -05:00
parent a75d272f4a
commit ff4cb32bc3
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/solotool.py
View File

@ -35,6 +35,7 @@ from fido2.hid import CtapHidDevice, CTAPHID
from fido2.client import Fido2Client, ClientError from fido2.client import Fido2Client, ClientError
from fido2.ctap import CtapError from fido2.ctap import CtapError
from fido2.ctap1 import CTAP1, ApduError from fido2.ctap1 import CTAP1, ApduError
from fido2.ctap2 import CTAP2
from fido2.utils import Timeout from fido2.utils import Timeout
import usb.core import usb.core
@ -145,6 +146,7 @@ class SoloClient:
raise RuntimeError('No FIDO device found') raise RuntimeError('No FIDO device found')
self.dev = dev self.dev = dev
self.ctap1 = CTAP1(dev) self.ctap1 = CTAP1(dev)
self.ctap2 = CTAP2(dev)
if self.exchange == self.exchange_hid: if self.exchange == self.exchange_hid:
self.send_data_hid(CTAPHID.INIT, '\x11\x11\x11\x11\x11\x11\x11\x11') self.send_data_hid(CTAPHID.INIT, '\x11\x11\x11\x11\x11\x11\x11\x11')
@ -222,6 +224,9 @@ class SoloClient:
def wink(self,): def wink(self,):
self.send_data_hid(CTAPHID.WINK, b'') self.send_data_hid(CTAPHID.WINK, b'')
def reset(self,):
self.ctap2.reset()
def enter_solo_bootloader(self,): def enter_solo_bootloader(self,):
""" """
If solo is configured as solo hacker or something similar, If solo is configured as solo hacker or something similar,
@ -560,11 +565,15 @@ def solo_main():
help='Continuously dump random numbers generated from Solo.', help='Continuously dump random numbers generated from Solo.',
) )
parser.add_argument("--wink", action="store_true", help='HID Wink command.') parser.add_argument("--wink", action="store_true", help='HID Wink command.')
parser.add_argument("--reset", action="store_true", help='Issue a FIDO2 reset command. Warning: your credentials will be lost.')
args = parser.parse_args() args = parser.parse_args()
p = SoloClient() p = SoloClient()
p.find_device() p.find_device()
if args.reset:
p.reset()
if args.rng: if args.rng:
while True: while True:
r = p.get_rng(255) r = p.get_rng(255)