accounts/usbwallet: fix ledger access for latest firmware and add Ledger Flex #31004
+13
−14
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
mdehoog
changed the title
fjl
changed the title
fjl
approved these changes
Jan 8, 2025
holiman
reviewed
Jan 8, 2025
| // Windows and Macos use UsageID matching, Linux uses Interface matching | ||
| if info.ProductID == id && (info.UsagePage == hub.usageID || info.Interface == hub.endpointID) { | ||
| if (info.ProductID == id || mmOnly == id) && (info.UsagePage == hub.usageID || info.Interface == hub.endpointID) { |
There was a problem hiding this comment.
This does not look right to me. Consider a future / non-compatible device, which identifies itself as 0x00aa.
mmOnly := 0x00aa & 0xff00 // 0x0000. The check mmOnly == id would match it as a Ledger Blue.
There was a problem hiding this comment.
I can't comment on if Ledger would release a product with an ID like this, but my understanding is that the 0x00** product IDs are legacy and new products would always follow the new MMII format.
An alternative might be to remove this product ID filtering altogether and just rely on the vendor ID lookup we're already doing.
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 latest firmware for Ledger Nano S Plus now returns
0x5000for it's product ID, which doesn't match any of the product IDs enumerated inhub.go.This PR removes the assumption about the interfaces exposed, and simply checks the upper byte for a match.
Also adds support for the
0x0007/0x7000product ID (Ledger Flex).