kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Version string for CTAP 2.1 (#590)

Browse Source 
* new version string for 2.1

* fixes new Python linter problems
This commit is contained in:
kaczmarczyck
2023-02-08 09:20:59 +01:00
committed by GitHub
parent 684d37fa03
commit 8733d6585f
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.pylintrc
View File

@@ -437,6 +437,6 @@ valid-metaclass-classmethod-first-arg=mcs
# Exceptions that will emit a warning when being caught. Defaults to # Exceptions that will emit a warning when being caught. Defaults to
# "Exception" # "Exception"
overgeneral-exceptions=StandardError, overgeneral-exceptions=builtins.StandardError,
Exception, builtins.Exception,
BaseException builtins.BaseException

2
deploy.py
View File

@@ -1160,7 +1160,7 @@ if __name__ == "__main__":
# We only need the apps_group if we have a board set # We only need the apps_group if we have a board set
apps_group = main_parser.add_mutually_exclusive_group( apps_group = main_parser.add_mutually_exclusive_group(
required=(partial_args.board is not None)) required=partial_args.board is not None)
apps_group.add_argument( apps_group.add_argument(
"--no-app", "--no-app",
dest="application", dest="application",

3
src/ctap/mod.rs
View File

@@ -111,8 +111,7 @@ const STATEFUL_COMMAND_TIMEOUT_DURATION: Milliseconds<ClockInt> = Milliseconds(3
pub const FIDO2_VERSION_STRING: &str = "FIDO_2_0"; pub const FIDO2_VERSION_STRING: &str = "FIDO_2_0";
#[cfg(feature = "with_ctap1")] #[cfg(feature = "with_ctap1")]
pub const U2F_VERSION_STRING: &str = "U2F_V2"; pub const U2F_VERSION_STRING: &str = "U2F_V2";
// TODO(#106) change to final string when ready pub const FIDO2_1_VERSION_STRING: &str = "FIDO_2_1";
pub const FIDO2_1_VERSION_STRING: &str = "FIDO_2_1_PRE";
// We currently only support one algorithm for signatures: ES256. // We currently only support one algorithm for signatures: ES256.
// This algorithm is requested in MakeCredential and advertized in GetInfo. // This algorithm is requested in MakeCredential and advertized in GetInfo.

4
tools/vendor_hid_test.py
View File

@@ -124,7 +124,7 @@ class HidInterfaces(unittest.TestCase):
def get_device(cls, usage_page) -> HidDevice: def get_device(cls, usage_page) -> HidDevice:
devices = list(get_devices(usage_page)) devices = list(get_devices(usage_page))
if len(devices) != 1: if len(devices) != 1:
raise Exception(f'Found {len(devices)} devices') raise RuntimeError(f'Found {len(devices)} devices')
return HidDevice(devices[0]) return HidDevice(devices[0])
def setUp(self) -> None: def setUp(self) -> None:
@@ -277,7 +277,7 @@ def get_fido_device() -> CtapHidDevice:
for d in CtapHidDevice.list_devices(): for d in CtapHidDevice.list_devices():
if d.descriptor.vid == _OPENSK_VID and d.descriptor.pid == _OPENSK_PID: if d.descriptor.vid == _OPENSK_VID and d.descriptor.pid == _OPENSK_PID:
return d return d
raise Exception('Unable to find Fido device') raise RuntimeError('Unable to find Fido device')
def get_fido_device_vendor() -> CtapHidDevice: def get_fido_device_vendor() -> CtapHidDevice: