Compare commits

...

2 Commits

Author SHA1 Message Date
Conor Patrick
f1c406ab9c fail with more import info 2019-07-08 21:48:39 -04:00
Conor Patrick
1185574d21 default no serial printing 2019-07-08 21:48:22 -04:00
2 changed files with 7 additions and 9 deletions

View File

@ -31,7 +31,7 @@
// #define DISABLE_CTAPHID_WINK // #define DISABLE_CTAPHID_WINK
// #define DISABLE_CTAPHID_CBOR // #define DISABLE_CTAPHID_CBOR
#define ENABLE_SERIAL_PRINTING // #define ENABLE_SERIAL_PRINTING
#if defined(SOLO_HACKER) #if defined(SOLO_HACKER)
#define SOLO_PRODUCT_NAME "Solo Hacker " SOLO_VERSION #define SOLO_PRODUCT_NAME "Solo Hacker " SOLO_VERSION

View File

@ -1,5 +1,5 @@
import time, struct import time, struct
from fido2.pcsc import CtapPcscDevice
from fido2.hid import CtapHidDevice from fido2.hid import CtapHidDevice
from fido2.client import Fido2Client from fido2.client import Fido2Client
from fido2.ctap1 import CTAP1 from fido2.ctap1 import CTAP1
@ -73,14 +73,12 @@ class Tester:
dev = next(CtapHidDevice.list_devices(), None) dev = next(CtapHidDevice.list_devices(), None)
if not dev: if not dev:
try:
from fido2.pcsc import CtapPcscDevice from fido2.pcsc import CtapPcscDevice
print("--- NFC ---") print("--- NFC ---")
print(list(CtapPcscDevice.list_devices())) print(list(CtapPcscDevice.list_devices()))
dev = next(CtapPcscDevice.list_devices(), None) dev = next(CtapPcscDevice.list_devices(), None)
except (ModuleNotFoundError, ImportError):
print("One of NFC library is not installed properly.")
if not dev: if not dev:
raise RuntimeError("No FIDO device found") raise RuntimeError("No FIDO device found")
self.dev = dev self.dev = dev