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
Fix branding issue with HOTP USB Security Dongles #761
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
0e349c5
Update hotp-verification
alex-nitrokey 1ba73ac
Rename CONFIG_LIBREMKEY to CONFIG_HOTPKEY
alex-nitrokey 3424317
Quick fix to build
alex-nitrokey fc8c7b0
Merge branch 'hotp-verification-update' into hotp-neutral
alex-nitrokey 4069619
Rename libremkey-hotp-verification module
alex-nitrokey 28735a8
Add CONFIG_HOTP_BRANDING
alex-nitrokey 53b67d2
Prepare usage of /boot/kexec_hotp_key as branding
alex-nitrokey 407778e
Remove unintented paranthesis
alex-nitrokey 38ba257
Include upstream updates of hotp_verification
alex-nitrokey aab2c32
Fix warning box title
alex-nitrokey 92b1826
/boot needs to get mounted first
alex-nitrokey 5867fc5
Store HOTP USB Security Key branding in /boot
alex-nitrokey 3236f0e
Change name seal-libremkey -> seal-hotpkey
alex-nitrokey 2fe946c
Fix termonology
alex-nitrokey fecb9cf
Rename CONFIG_HOTP_BRANDING to HOTP_BRANDING
alex-nitrokey 73c9d6e
Merge branch 'hotp-verification-update' into hotp-neutral-merge
alex-nitrokey c2a2134
Merge remote-tracking branch 'upstream/master' into hotp-neutral
alex-nitrokey 53dc659
Replace libremkey_htop_* by hotp_*
alex-nitrokey d3d4529
GitlabCI: reset cache, and investigate
szszszsz 9c9edb0
Remove pkg-config and git version use
szszszsz d472c43
Fix quoting of variable
techge File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
# empty placeholder file | ||
# This submodule is defined in modules/libremkey-hotp-verification | ||
# This submodule is defined in modules/hotp-verification |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
modules-$(CONFIG_HOTPKEY) += hotp-verification | ||
|
||
hotp-verification_depends := libusb $(musl_dep) | ||
|
||
hotp-verification_version := 5fb260e631b237a298b6dcca47bbd728f2c5ac3a | ||
hotp-verification_dir := hotp-verification-$(hotp-verification_version) | ||
hotp-verification_tar := nitrokey-hotp-verification-$(hotp-verification_version).tar.gz | ||
hotp-verification_url := https://github.com/Nitrokey/nitrokey-hotp-verification/archive/$(hotp-verification_version).tar.gz | ||
hotp-verification_hash := 5d98d158ba97fb970061d68e2c6f41582395e687b7752efb1a8038762b0e7b79 | ||
|
||
hotp-verification_target := \ | ||
$(MAKE_JOBS) \ | ||
$(CROSS_TOOLS) \ | ||
|
||
hotp-verification_output := \ | ||
hotp_verification \ | ||
hotp_initialize | ||
|
||
hotp-verification_configure := \ | ||
INSTALL="$(INSTALL)" \ | ||
CROSS="$(CROSS)" \ | ||
$(CROSS_TOOLS) $(MAKE) LDFLAGS="$(INSTALL)/lib/libusb-1.0.so" GITVERSION="" LIBUSB_FLAGS="-I/usr/include/libusb-1.0" PKGCONFIG="" && $(MAKE) install INSTALL="$(INSTALL)" | ||
|
||
hotp-verification_depends += hidapi | ||
modules-y += hidapi | ||
|
||
hidapi_version := e5ae0d30a523c565595bdfba3d5f2e9e1faf0bd0 | ||
hidapi_dir := hotp-verification-$(hotp-verification_version)/hidapi | ||
hidapi_tar := hidapi-$(hidapi_version).tar.xz | ||
hidapi_url := https://github.com/Nitrokey/hidapi/archive/$(hidapi_version).tar.gz | ||
hidapi_hash := acc2a5089a8917085c2b3ebe9446065a21c760ba7e13cb54917043c4122188e0 | ||
|
||
|
||
## hidapi will be built as part of hotp-verification | ||
## so nothing to do here (but need make to be happy) | ||
hidapi_output := .built | ||
hidapi_configure := echo -e 'all:\n\ttouch .built' > Makefile |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure why, but this ends up showing my Librem Key as a Nitrokey.
using:
elif lsusb | grep -q "316d:" ; then
works correctly however
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The negation is used because grep returns 0 if it found something.
Older Librem Keys had the same VID as the Nitrokeys because of a mistake done when building the firmware for it, see #761 (comment)
I could not think of a way to prevent that :(
So I am wondering, what is the return value of
lsusb | grep -q "316d:"
for you? If it is0
the patch should work as intended. Does it?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In other words first batches of the Librem Key had incorrectly set VID:PID to the same as Nitrokey Pro has, hence the confusion.
Perhaps they have changed the USB names only back then (might not show up in the
lsusb
, but maybedmesg
) - that would already help to differentiate between models, otherwise I do not see how to make it possible.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
0, and no the patch does not work correctly with my LK. It identifies as a NK without the change I mentioned above
edit: this LK is one of our new US-built ones with VID/DID 316d:4c4b. Another older one is 20a0:4108 and so identifies as a Nitrokey
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
pushed #781 to fix