Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add trussed abstraction and nkpk subcommand #500

Merged
merged 8 commits into from
Feb 1, 2024
Merged

Add trussed abstraction and nkpk subcommand #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6fd7f91
nk3: Extract basic functionality into trussed module
robin-nitrokey Jan 20, 2024
43b55ee
nk3: Move admin_app into trussed module
robin-nitrokey Jan 23, 2024
f06c1e3
trussed, nk3: Move commands into apps
robin-nitrokey Jan 23, 2024
433ef96
nk3: Move some commands into trussed module
robin-nitrokey Jan 23, 2024
2ec83cd
nk3: Move test into trussed module
robin-nitrokey Jan 24, 2024
b2255f1
nk3: Move provisioner into trussed module
robin-nitrokey Jan 26, 2024
7b99e2b
Add nkpk commands
robin-nitrokey Jan 23, 2024
e3c0f7c
nk3/nkpk: Fix device listing
robin-nitrokey Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion pynitrokey/cli/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from pynitrokey.cli.fido2 import fido2
from pynitrokey.cli.nethsm import nethsm
from pynitrokey.cli.nk3 import nk3
from pynitrokey.cli.nkpk import nkpk
from pynitrokey.cli.pro import pro
from pynitrokey.cli.start import start
from pynitrokey.cli.storage import storage
Expand Down Expand Up @@ -87,6 +88,7 @@ def nitropy():
nitropy.add_command(fido2)
nitropy.add_command(nethsm)
nitropy.add_command(nk3)
nitropy.add_command(nkpk)
nitropy.add_command(start)
nitropy.add_command(storage)
nitropy.add_command(pro)
Expand All @@ -102,9 +104,13 @@ def version():


def _list():
from .nk3 import _list as list_nk3
from .nkpk import _list as list_nkpk

fido2.commands["list"].callback()
start.commands["list"].callback()
nk3.commands["list"].callback()
list_nk3()
list_nkpk()
# TODO add other handled models


Expand Down
Loading
Loading