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.

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

Merge 7d1d9ec2bfae231ca4a7263a7e223db9fed51aa5 from solo2 #20

Merged
merged 7 commits into from
Dec 1, 2021

Conversation

robin-nitrokey
Copy link
Member

This merge of 7d1d9ec updates the dependencies specifications (no branch specification) to avoid duplicates and extracts the admin app into a separate crate.

robin-nitrokey and others added 7 commits October 23, 2021 14:53
The FILESYSTEM_BOUNDARY constant in the provisioner app is currently
unused.  The actual filesystem boundaries are defined in the build.rs
file.  To make the code easier to understand and to avoid confusion,
this patch removes the unused constant.
Previously, the CTAPHID interface of the admin app did not handle the
UUID command and interpreted all unknown commands as Wink commands.
With this patch, we explicitly handle both the Wink and the UUID command
and return an error if any other command is received.
This merge updates the dependencies specifications (no branch
specification) to avoid duplicates and extracts the admin app into a
separate crate.
@robin-nitrokey robin-nitrokey added the merge Merge from upstream solo2 label Nov 26, 2021
@robin-nitrokey robin-nitrokey merged commit 53dc1ee into nitrokey-main Dec 1, 2021
@robin-nitrokey robin-nitrokey deleted the merge-2021-11-26 branch December 1, 2021 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge Merge from upstream solo2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants