diff --git a/setup.sh b/setup.sh index 13ad9b0..6d58053 100755 --- a/setup.sh +++ b/setup.sh @@ -46,4 +46,4 @@ mkdir -p elf2tab cargo install elf2tab --version 0.6.0 --root elf2tab/ # Install python dependencies to factory configure OpenSK (crypto, JTAG lockdown) -pip3 install --user --upgrade colorama tqdm cryptography fido2 +pip3 install --user --upgrade colorama tqdm cryptography "fido2>=0.9.1" diff --git a/tools/configure.py b/tools/configure.py index cc00a1a..9343490 100755 --- a/tools/configure.py +++ b/tools/configure.py @@ -64,8 +64,7 @@ def info(msg): def get_opensk_devices(batch_mode): devices = [] for dev in hid.CtapHidDevice.list_devices(): - if (dev.descriptor["vendor_id"], - dev.descriptor["product_id"]) == OPENSK_VID_PID: + if (dev.descriptor.vid, dev.descriptor.pid) == OPENSK_VID_PID: if dev.capabilities & hid.CAPABILITY.CBOR: if batch_mode: devices.append(ctap2.CTAP2(dev)) @@ -138,10 +137,9 @@ def main(args): if authenticator.device.capabilities & hid.CAPABILITY.WINK: authenticator.device.wink() aaguid = uuid.UUID(bytes=authenticator.get_info().aaguid) - info(("Programming device {} AAGUID {} ({}). " - "Please touch the device to confirm...").format( - authenticator.device.descriptor.get("product_string", "Unknown"), - aaguid, authenticator.device)) + info("Programming OpenSK device AAGUID {} ({}).".format( + aaguid, authenticator.device)) + info("Please touch the device to confirm...") try: result = authenticator.send_cbor( OPENSK_VENDOR_CONFIGURE,