Fix device discovery in NitrokeyManager::connect_with_path #194
Conversation
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
The device discovery in NitrokeyManager's connect_with_path method is broken. It tries to statically determine the vendor ID by using the first working HID pointer. That's obviously not working when a both a Nitrokey device and Librem Key are connected and the path is describing a Librem Key. In such a case the vendor ID used would be that for the Nitrokey and we would not be able to find the Librem Key at all. This change fixes up the logic.
d-e-s-o
force-pushed
the
topic/fix-device-discovery
branch
2 times, most recently
from
0da3469 to
3faa000
Compare
|
Can this pull request please be merged? @szszszsz |
|
Noted! Sorry for the delay. Scheduled early for the next week. |
|
Merged, thank you! |
|
Will you cut a new release with this fix? Without it, it's not possible to test for the Librem Key without manual labor in the form of physically replugging hardware keys. |
|
Yes, should be done this week (delayed from the previous one). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The device discovery in NitrokeyManager's connect_with_path method is
broken. It tries to statically determine the vendor ID by using the
first working HID pointer. That's obviously not working when a both a
Nitrokey device and Librem Key are connected and the path is describing
a Librem Key. In such a case the vendor ID used would be that for the
Nitrokey and we would not be able to find the Librem Key at all. This
change fixes up the logic.