From 24a760a2661c627bfe53057c538fcb110ec84b97 Mon Sep 17 00:00:00 2001 From: Sebastian Meyer Date: Mon, 7 Oct 2024 10:34:51 +0200 Subject: [PATCH 1/4] Fixed incorrect argument count for SimulateIso14443aTag Signed-off-by: Sebastian Meyer --- armsrc/Standalone/hf_aveful.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/armsrc/Standalone/hf_aveful.c b/armsrc/Standalone/hf_aveful.c index e8797f89dd..1ca06ddb06 100644 --- a/armsrc/Standalone/hf_aveful.c +++ b/armsrc/Standalone/hf_aveful.c @@ -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; From 0b3c3dd0eaab28e6cd5ea28ca28d61081a701fe6 Mon Sep 17 00:00:00 2001 From: Sebastian Meyer Date: Mon, 7 Oct 2024 10:35:22 +0200 Subject: [PATCH 2/4] Update CHANGELOG.md Fixed incorrect argument count for SimulateIso14443aTag in aveful.c Signed-off-by: Sebastian Meyer --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e90300390..d3cef45b02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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` and `hf_aveful.c`. ## [Backdoor.4.18994][2024-09-10] - Changed flashing messages to be less scary (@iceman1001) From 1f660557ebb080b7a7f09f8fca2ebaf7da961b53 Mon Sep 17 00:00:00 2001 From: Sebastian Meyer Date: Mon, 7 Oct 2024 10:54:47 +0200 Subject: [PATCH 3/4] Fix hf_craftbyte.c: too few arguments to function 'SimulateIso14443aTag' Signed-off-by: Sebastian Meyer --- armsrc/Standalone/hf_craftbyte.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/armsrc/Standalone/hf_craftbyte.c b/armsrc/Standalone/hf_craftbyte.c index 41d9a35032..06d032f272 100644 --- a/armsrc/Standalone/hf_craftbyte.c +++ b/armsrc/Standalone/hf_craftbyte.c @@ -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 From 51520adc1d6b323a336b7c22f9202db9cdc0e5b8 Mon Sep 17 00:00:00 2001 From: Sebastian Meyer Date: Mon, 7 Oct 2024 10:55:34 +0200 Subject: [PATCH 4/4] Update CHANGELOG.md Signed-off-by: Sebastian Meyer --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3cef45b02..46be984a65 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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` and `hf_aveful.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)