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.

Sign up for GitHub

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

Jump to bottom

Fix hf_aveful.c: too few arguments to function 'SimulateIso14443aTag' #2562

Merged
merged 5 commits into from
Oct 7, 2024
Merged

Fix hf_aveful.c: too few arguments to function 'SimulateIso14443aTag' #2562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24a760a
Fixed incorrect argument count for SimulateIso14443aTag
archi Oct 7, 2024
0b3c3dd
Update CHANGELOG.md
archi Oct 7, 2024
1f66055
Fix hf_craftbyte.c: too few arguments to function 'SimulateIso14443aTag'
archi Oct 7, 2024
51520ad
Update CHANGELOG.md
archi Oct 7, 2024
33c9dfc
Merge pull request #1 from archi/hf_craftbyte_SimulateIso14443aTag
archi Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Added detection of a magic NTAG 215 (@iceman1001)
- Fixed hardnested on AVX512F #2410 (@xianglin1998)
- Added `hf 14a aidsim` - simulates a PICC (like `14a sim`), and allows you to respond to specific AIDs and getData responses (@evildaemond)
- Fixed incorrect argument count for `SimulateIso14443aTag` in `hf_young.c`.
- Fixed incorrect argument count for `SimulateIso14443aTag` in `hf_young.c`, `hf_aveful.c` and `hf_craftbyte.c`.

## [Backdoor.4.18994][2024-09-10]
- Changed flashing messages to be less scary (@iceman1001)
Expand Down
2 changes: 1 addition & 1 deletion armsrc/Standalone/hf_aveful.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ void RunMod(void) {
uint16_t flags = FLAG_7B_UID_IN_DATA;

Dbprintf("Starting simulation, press " _GREEN_("pm3 button") " to stop and go back to search state.");
SimulateIso14443aTag(7, flags, card.uid, 0);
SimulateIso14443aTag(7, flags, card.uid, 0, NULL);

// Go back to search state if user presses pm3-button
state = STATE_SEARCH;
Expand Down
12 changes: 6 additions & 6 deletions armsrc/Standalone/hf_craftbyte.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,22 @@ void RunMod(void) {
Dbprintf("Starting simulation, press " _GREEN_("pm3 button") " to stop and go back to search state.");
if (card.sak == 0x08 && card.atqa[0] == 0x04 && card.atqa[1] == 0) {
DbpString("Mifare Classic 1k");
SimulateIso14443aTag(1, flags, card.uid, 0);
SimulateIso14443aTag(1, flags, card.uid, 0, NULL);
} else if (card.sak == 0x08 && card.atqa[0] == 0x44 && card.atqa[1] == 0) {
DbpString("Mifare Classic 4k ");
SimulateIso14443aTag(8, flags, card.uid, 0);
SimulateIso14443aTag(8, flags, card.uid, 0, NULL);
} else if (card.sak == 0x00 && card.atqa[0] == 0x44 && card.atqa[1] == 0) {
DbpString("Mifare Ultralight");
SimulateIso14443aTag(2, flags, card.uid, 0);
SimulateIso14443aTag(2, flags, card.uid, 0, NULL);
} else if (card.sak == 0x20 && card.atqa[0] == 0x04 && card.atqa[1] == 0x03) {
DbpString("Mifare DESFire");
SimulateIso14443aTag(3, flags, card.uid, 0);
SimulateIso14443aTag(3, flags, card.uid, 0, NULL);
} else if (card.sak == 0x20 && card.atqa[0] == 0x44 && card.atqa[1] == 0x03) {
DbpString("Mifare DESFire Ev1/Plus/JCOP");
SimulateIso14443aTag(3, flags, card.uid, 0);
SimulateIso14443aTag(3, flags, card.uid, 0, NULL);
} else {
Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
SimulateIso14443aTag(1, flags, card.uid, 0);
SimulateIso14443aTag(1, flags, card.uid, 0, NULL);
}

// Go back to search state if user presses pm3-button
Expand Down
Loading