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

Add Saflok and MyKey KDFs #476

Merged
merged 3 commits into from
Dec 4, 2023
Merged

Add Saflok and MyKey KDFs #476

merged 3 commits into from
Dec 4, 2023

Conversation

noproto
Copy link
Contributor

@noproto noproto commented Dec 4, 2023

What's new

  • Added new KDF plugins for the NFC app

For the reviewer

  • I've uploaded the firmware with this patch to a device and verified its functionality
  • I've confirmed the bug to be fixed / feature to be stable

@Willy-JL
Copy link
Contributor

Willy-JL commented Dec 4, 2023

thanks!

we got another PR for mykey recently in #467, should i revert that in favor of this one? im not really sure about the difference...

@Willy-JL
Copy link
Contributor

Willy-JL commented Dec 4, 2023

from a cursory look this implementation seems more in line with the intended use of supported_cards plugins, expanding on the base protocols already implemented, while the on in #467 looks more like a separate protocol?

@noproto
Copy link
Contributor Author

noproto commented Dec 4, 2023

Yeah, one is a plugin and the other is modifying the protocol itself. Almost seems like the other PR is assuming every ST25TB is MyKey.

@Willy-JL
Copy link
Contributor

Willy-JL commented Dec 4, 2023

you're right, i hadn't noticed that...

This reverts commit 3ae1eee, reversing
changes made to 4f8e80b.
@Willy-JL Willy-JL merged commit 82d157c into Flipper-XFW:dev Dec 4, 2023
3 checks passed
@Willy-JL Willy-JL added the enhancement New feature or request label Dec 4, 2023
@augustozanellato
Copy link
Contributor

Almost seems like the other PR is assuming every ST25TB is MyKey.

This PR also does that :)
If you look at the parse function you’ll see that it always returns true.
My take on that parser (OFW PR#3262) tries to determine if the tag is actually a mykey or not, maybe it could still have some false positives, but imho it’s better than blindly parsing everything.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants