github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

text

Browse source
This commit is contained in:
iceman1001 2022-07-25 07:45:57 +02:00
commit 2f7083a59a
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/src/cmdhfmf.c
View file

@ -3421,18 +3421,22 @@ void readerAttack(sector_t *k_sector, uint8_t k_sectorsCount, nonces_t data, boo
static int CmdHF14AMfSim(const char *Cmd) { static int CmdHF14AMfSim(const char *Cmd) {
CLIParserContext *ctx; CLIParserContext *ctx;
CLIParserInit(&ctx, "hf mf sim", CLIParserInit(&ctx, "hf mf sim",
"Simulate MIFARE Classic card", "Simulate MIFARE Classic family type based upon\n"
"ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n"
"from emulator memory. See `hf mf eload` first.\n"
"The UID from emulator memory will be used if not specified.",
"hf mf sim --mini --> MIFARE Mini\n" "hf mf sim --mini --> MIFARE Mini\n"
"hf mf sim --1k --> MIFARE Classic 1k (default)\n" "hf mf sim --1k --> MIFARE Classic 1k (default)\n"
"hf mf sim --1k -u 0a0a0a0a --> MIFARE Classic 1k with 4b UID\n" "hf mf sim --1k -u 0a0a0a0a --> MIFARE Classic 1k with 4b UID\n"
"hf mf sim --1k -u 11223344556677 --> MIFARE Classic 1k with 7b UID\n" "hf mf sim --1k -u 11223344556677 --> MIFARE Classic 1k with 7b UID\n"
"hf mf sim --1k -u 11223344 -i -x --> Perform reader attack in interactive mode\n" "hf mf sim --1k -u 11223344 -i -x --> Perform reader attack in interactive mode\n"
"hf mf sim --2k --> MIFARE 2k\n" "hf mf sim --2k --> MIFARE 2k\n"
"hf mf sim --4k --> MIFARE 4k"); "hf mf sim --4k --> MIFARE 4k"
);
void *argtable[] = { void *argtable[] = {
arg_param_begin, arg_param_begin,
arg_str0("u", "uid", "<hex>", "UID 4,7 or 10bytes. If not specified, the UID 4b/7b from emulator memory will be used"), arg_str0("u", "uid", "<hex>", "<4|7|10> hex bytes UID"),
arg_lit0(NULL, "mini", "MIFARE Classic Mini / S20"), arg_lit0(NULL, "mini", "MIFARE Classic Mini / S20"),
arg_lit0(NULL, "1k", "MIFARE Classic 1k / S50"), arg_lit0(NULL, "1k", "MIFARE Classic 1k / S50"),
arg_lit0(NULL, "2k", "MIFARE Classic/Plus 2k"), arg_lit0(NULL, "2k", "MIFARE Classic/Plus 2k"),

5
client/src/cmdhfmfu.c
View file

@ -2716,6 +2716,7 @@ static int CmdHF14AMfUeLoad(const char *Cmd) {
int res = CmdHF14AMfELoad(nc); int res = CmdHF14AMfELoad(nc);
free(nc); free(nc);
PrintAndLogEx(HINT, "Try " _YELLOW_("`hf mfu sim -t 7`") " to simulate an Amiibo.");
return res; return res;
} }
// //
@ -2727,9 +2728,11 @@ static int CmdHF14AMfUSim(const char *Cmd) {
"Simulate MIFARE Ultralight family type based upon\n" "Simulate MIFARE Ultralight family type based upon\n"
"ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n" "ISO/IEC 14443 type A tag with 4,7 or 10 byte UID\n"
"from emulator memory. See `hf mfu eload` first. \n" "from emulator memory. See `hf mfu eload` first. \n"
"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.", "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 2 --uid 11223344556677 -> MIFARE Ultralight\n"
"hf mfu sim -t 7 --uid 11223344556677 -n 5 -> AMIIBO (NTAG 215), pack 0x8080" "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"
); );
void *argtable[] = { void *argtable[] = {