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

Merge bugfix into stable (#324)

Browse Source 
* Add Feitian OpenSK USB Dongle (#257)

Co-authored-by: superskybird <skybird.le@gmail.com>

* Fix `config.py` tool according to the new API of fido2 python package (#284)

* Fix fido2 API update.

Since fido2 0.8.1 the device descriptor moved to NamedTuple, breaking
our configuration tool.
Code is now updated accordingly and the setup script ensure we're
using the correct version for fido2 package.

* Make Yapf happy

* Fix missing update for fido2 0.9.1

Also split the comment into 2 lines so that the touch is not hidden
at the end of the screen.

* adds README changes, logo and certificate (#285)

* Fix broken parsing. (#317)

* Fix broken parsing.

By setting the default value before pre-parsing we ensure that the item
can't be None. As an extra safety the custom action also checks for
None.

Co-authored-by: Geoffrey <geoffrey@ftsafe.com>
Co-authored-by: superskybird <skybird.le@gmail.com>
Co-authored-by: kaczmarczyck <43844792+kaczmarczyck@users.noreply.github.com>
This commit is contained in:
Jean-Michel Picod
2021-06-09 16:50:00 +02:00
committed by GitHub
parent 5e682d9e17
commit 7e5e2a665f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deploy.py
View File

@@ -243,6 +243,8 @@ class RemoveConstAction(argparse.Action):
# https://github.com/python/cpython/blob/master/Lib/argparse.py#L138-L147 # https://github.com/python/cpython/blob/master/Lib/argparse.py#L138-L147
# https://github.com/python/cpython/blob/master/Lib/argparse.py#L1028-L1052 # https://github.com/python/cpython/blob/master/Lib/argparse.py#L1028-L1052
items = getattr(namespace, self.dest, []) items = getattr(namespace, self.dest, [])
if items is None:
items = []
if isinstance(items, list): if isinstance(items, list):
items = items[:] items = items[:]
else: else:
@@ -916,6 +918,8 @@ if __name__ == "__main__":
help=("When set, the output of elf2tab is appended to this file."), help=("When set, the output of elf2tab is appended to this file."),
) )
main_parser.set_defaults(features=["with_ctap1"])
# Start parsing to know if we're going to list things or not. # Start parsing to know if we're going to list things or not.
partial_args, _ = main_parser.parse_known_args() partial_args, _ = main_parser.parse_known_args()
@@ -977,6 +981,4 @@ if __name__ == "__main__":
help=("Compiles and installs the nfct_test example that tests the " help=("Compiles and installs the nfct_test example that tests the "
"NFC driver.")) "NFC driver."))
main_parser.set_defaults(features=["with_ctap1"])
main(main_parser.parse_args()) main(main_parser.parse_args())