From f828a727c9d984eced189312475feac34d47993b Mon Sep 17 00:00:00 2001 From: DidierA <1620015+DidierA@users.noreply.github.com> Date: Sun, 20 Nov 2022 01:01:11 +0100 Subject: [PATCH 1/3] Fix: hf 14a sim parsing args was taking tag type as number of reads if no -n option given --- client/src/cmdhf14a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index df13e0862..1b0bd1b1f 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -715,7 +715,7 @@ int CmdHF14ASim(const char *Cmd) { useUIDfromEML = false; } - uint8_t exitAfterNReads = arg_get_int(ctx, 3); + uint8_t exitAfterNReads = arg_get_int_def(ctx, 3, 0); if (arg_get_lit(ctx, 4)) { flags |= FLAG_NR_AR_ATTACK; From 1d00ef797c046f419f0e57dcc824b2ec1cb889c2 Mon Sep 17 00:00:00 2001 From: DidierA <1620015+DidierA@users.noreply.github.com> Date: Sun, 20 Nov 2022 01:26:42 +0100 Subject: [PATCH 2/3] hf 14a sim, hf mfu sim: add hint for Ultralitgh EV1 --- client/src/cmdhf14a.c | 2 +- client/src/cmdhfmfu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index 1b0bd1b1f..e7cc42908 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -669,7 +669,7 @@ int CmdHF14ASim(const char *Cmd) { "hf 14a sim -t 4 -> ISO/IEC 14443-4\n" "hf 14a sim -t 5 -> MIFARE Tnp3xxx\n" "hf 14a sim -t 6 -> MIFARE Mini\n" - "hf 14a sim -t 7 -> Amiibo (NTAG 215), pack 0x8080\n" + "hf 14a sim -t 7 -> MIFARE Ultralight EV1, Amiibo (NTAG 215), pack 0x8080\n" "hf 14a sim -t 8 -> MIFARE Classic 4k\n" "hf 14a sim -t 9 -> FM11RF005SH Shanghai Metro\n" "hf 14a sim -t 10 -> ST25TA IKEA Rothult\n"); diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index 05436d77f..ba028e958 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -2730,8 +2730,8 @@ static int CmdHF14AMfUSim(const char *Cmd) { "The UID from emulator memory will be used if not specified.\n" "See `hf 14a sim -h` to see available types. You want 2 or 7 usually.", "hf mfu sim -t 2 --uid 11223344556677 -> MIFARE Ultralight\n" - "hf mfu sim -t 7 --uid 11223344556677 -n 5 -> Amiibo (NTAG 215), pack 0x8080\n" - "hf mfu sim -t 7 -> Amiibo (NTAG 215), pack 0x8080" + "hf mfu sim -t 7 --uid 11223344556677 -n 5 -> MIFARE Ultralight EV1, Amiibo (NTAG 215), pack 0x8080\n" + "hf mfu sim -t 7 -> MIFARE Ultralight EV1, Amiibo (NTAG 215), pack 0x8080" ); void *argtable[] = { From 9dbd6e5f23c6424bc298606ffea65338a9a1ae58 Mon Sep 17 00:00:00 2001 From: DidierA <1620015+DidierA@users.noreply.github.com> Date: Sun, 20 Nov 2022 15:31:20 +0100 Subject: [PATCH 3/3] change help text to fit screen --- client/src/cmdhf14a.c | 23 ++++++++++++----------- client/src/cmdhfmfu.c | 4 ++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/client/src/cmdhf14a.c b/client/src/cmdhf14a.c index e7cc42908..f8a96fedd 100644 --- a/client/src/cmdhf14a.c +++ b/client/src/cmdhf14a.c @@ -662,17 +662,18 @@ static int CmdHF14ACUIDs(const char *Cmd) { int CmdHF14ASim(const char *Cmd) { CLIParserContext *ctx; CLIParserInit(&ctx, "hf 14a sim", - "Simulate ISO/IEC 14443 type A tag with 4,7 or 10 byte UID", - "hf 14a sim -t 1 --uid 11223344 -> MIFARE Classic 1k\n" - "hf 14a sim -t 2 -> MIFARE Ultralight\n" - "hf 14a sim -t 3 -> MIFARE Desfire\n" - "hf 14a sim -t 4 -> ISO/IEC 14443-4\n" - "hf 14a sim -t 5 -> MIFARE Tnp3xxx\n" - "hf 14a sim -t 6 -> MIFARE Mini\n" - "hf 14a sim -t 7 -> MIFARE Ultralight EV1, Amiibo (NTAG 215), pack 0x8080\n" - "hf 14a sim -t 8 -> MIFARE Classic 4k\n" - "hf 14a sim -t 9 -> FM11RF005SH Shanghai Metro\n" - "hf 14a sim -t 10 -> ST25TA IKEA Rothult\n"); + "Simulate ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n" + "Use type 7 for Mifare Ultralight EV1, Amiibo (NTAG215 pack 0x8080)", + "hf 14a sim -t 1 --uid 11223344 -> MIFARE Classic 1k\n" + "hf 14a sim -t 2 -> MIFARE Ultralight\n" + "hf 14a sim -t 3 -> MIFARE Desfire\n" + "hf 14a sim -t 4 -> ISO/IEC 14443-4\n" + "hf 14a sim -t 5 -> MIFARE Tnp3xxx\n" + "hf 14a sim -t 6 -> MIFARE Mini\n" + "hf 14a sim -t 7 -> MFUEV1 / NTAG 215 Amiibo\n" + "hf 14a sim -t 8 -> MIFARE Classic 4k\n" + "hf 14a sim -t 9 -> FM11RF005SH Shanghai Metro\n" + "hf 14a sim -t 10 -> ST25TA IKEA Rothult\n"); void *argtable[] = { arg_param_begin, diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index ba028e958..aa93047e2 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -2730,8 +2730,8 @@ static int CmdHF14AMfUSim(const char *Cmd) { "The UID from emulator memory will be used if not specified.\n" "See `hf 14a sim -h` to see available types. You want 2 or 7 usually.", "hf mfu sim -t 2 --uid 11223344556677 -> MIFARE Ultralight\n" - "hf mfu sim -t 7 --uid 11223344556677 -n 5 -> MIFARE Ultralight EV1, Amiibo (NTAG 215), pack 0x8080\n" - "hf mfu sim -t 7 -> MIFARE Ultralight EV1, Amiibo (NTAG 215), pack 0x8080" + "hf mfu sim -t 7 --uid 11223344556677 -n 5 -> MFUEV1 / NTAG 215 Amiibo\n" + "hf mfu sim -t 7 -> MFUEV1 / NTAG 215 Amiibo" ); void *argtable[] = {