github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1814 from DidierA/hf_14a_sim

Browse source 
Hf 14a sim : fix parsing error and add hint for ultralight EV1
This commit is contained in:
Iceman 2022-11-20 16:01:52 +01:00 • committed by GitHub
commit 7e114da30f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/src/cmdhf14a.c
View file

@ -662,14 +662,15 @@ 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",
"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 -> Amiibo (NTAG 215), pack 0x8080\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");
@ -715,7 +716,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;

4
client/src/cmdhfmfu.c
View file

@ -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 -> MFUEV1 / NTAG 215 Amiibo\n"
"hf mfu sim -t 7 -> MFUEV1 / NTAG 215 Amiibo"
);
void *argtable[] = {