Skip to content

hf mf elog --decrypt skip records with found keys#239

Merged
GameTec-live merged 2 commits intoRfidResearchGroup:mainfrom
taichunmin:mfkey32
Aug 14, 2025
Merged

hf mf elog --decrypt skip records with found keys#239
GameTec-live merged 2 commits intoRfidResearchGroup:mainfrom
taichunmin:mfkey32

Conversation

@taichunmin
Copy link
Copy Markdown
Contributor

No description provided.

@github-actions
Copy link
Copy Markdown

github-actions Bot commented Nov 19, 2024

Built artifacts for commit 06a873f

Firmware

Client

@taichunmin taichunmin force-pushed the mfkey32 branch 6 times, most recently from 10fce1f to 0352806 Compare November 19, 2024 09:16
zeusricote pushed a commit to zeusricote/ChameleonUltra that referenced this pull request Jun 18, 2025
Copy link
Copy Markdown
Contributor

@LupusE LupusE left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works. I see no conflict with the other pending PRs.

@GameTec-live
Copy link
Copy Markdown
Contributor

why do you always do force pushes? lol

@taichunmin
Copy link
Copy Markdown
Contributor Author

@GameTec-live because I try to prevent three-way merge.

@LupusE
Copy link
Copy Markdown
Contributor

LupusE commented Aug 9, 2025

I would prefer a clean three-way-merge, because of the changes in software/script/chameleon_cli_unit.py.
But I have no prove that it necessary. If you say it won't affect main, it is fine for me.

@GameTec-live
Copy link
Copy Markdown
Contributor

one disadvantage of force pushes and more or less doing a one commit pr tho is that you lose the entire history and make bisection harder

@taichunmin taichunmin force-pushed the mfkey32 branch 2 times, most recently from 2547227 to 5c3c99b Compare August 11, 2025 20:49
@GameTec-live GameTec-live merged commit 4c1096d into RfidResearchGroup:main Aug 14, 2025
8 of 9 checks passed
@taichunmin taichunmin deleted the mfkey32 branch August 26, 2025 02:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants