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

Adding Figurine Type ID and Figurine ID parameters for hf jooki

Browse source
This commit is contained in:
Akif Dinc 2021-02-16 20:53:53 +01:00
commit be25db2804
1 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

39
client/src/cmdhfjooki.c
View file

@ -278,7 +278,8 @@ static int CmdHF14AJookiEncode(const char *Cmd) {
"Encode a Jooki token to base64 NDEF URI format", "Encode a Jooki token to base64 NDEF URI format",
"hf jooki encode -t --> selftest\n" "hf jooki encode -t --> selftest\n"
"hf jooki encode -r --dragon --> read uid from tag and use for encoding\n" "hf jooki encode -r --dragon --> read uid from tag and use for encoding\n"
"hf jooki encode --uid 04010203040506 --dragon" "hf jooki encode --uid 04010203040506 --dragon\n"
"hf jooki encode --uid 04010203040506 -y 1 -f 1"
); );
void *argtable[] = { void *argtable[] = {
@ -300,6 +301,8 @@ static int CmdHF14AJookiEncode(const char *Cmd) {
arg_lit0(NULL, "whitefox", "figurine type"), arg_lit0(NULL, "whitefox", "figurine type"),
arg_lit0(NULL, "whiteknight", "figurine type"), arg_lit0(NULL, "whiteknight", "figurine type"),
arg_lit0(NULL, "whitewhale", "figurine type"), arg_lit0(NULL, "whitewhale", "figurine type"),
arg_u64_0("y", "tid", "<dec>", "figurine type id"),
arg_u64_0("f", "fid", "<dec>", "figurine id"),
arg_param_end arg_param_end
}; };
CLIExecWithReturn(ctx, Cmd, argtable, false); CLIExecWithReturn(ctx, Cmd, argtable, false);
@ -328,18 +331,42 @@ static int CmdHF14AJookiEncode(const char *Cmd) {
bool tb = arg_get_lit(ctx, 15); bool tb = arg_get_lit(ctx, 15);
bool tc = arg_get_lit(ctx, 16); bool tc = arg_get_lit(ctx, 16);
bool td = arg_get_lit(ctx, 17); bool td = arg_get_lit(ctx, 17);
bool figure_abbr = true;
uint8_t ftid = arg_get_u32_def(ctx, 18, 0);
uint8_t ffid = arg_get_u32_def(ctx, 19, 0); //default 0 ist schlecht
CLIParserFree(ctx); CLIParserFree(ctx);
if (selftest) { if (selftest) {
return jooki_selftest(); return jooki_selftest();
} }
if ((t0 + t1 + t2 + t3 + t5 + t6 + t7 + t8 + t9 + ta + tb + tc + td) > 1) { uint8_t tid, fid;
PrintAndLogEx(ERR, "Select one tag type");
return PM3_EINVARG; if( ftid && ffid ) {
figure_abbr = true;
tid = 0x01;
fid = 0x00;
} }
uint8_t tid = 0x01;
uint8_t fid = 0x00; if ( ftid > 0x04 || ffid > 0x20 ) {
PrintAndLogEx(ERR, "Use a valid Figure Type ID and Figure ID");
return PM3_EINVARG;
} else {
figure_abbr = false;
}
if ((t0 + t1 + t2 + t3 + t5 + t6 + t7 + t8 + t9 + ta + tb + tc + td) > 1 && !figure_abbr) {
PrintAndLogEx(ERR, "Select one tag type or use figurine type id and figurine id");
return PM3_EINVARG;
} else {
tid = ftid;
fid = ffid;
}
PrintAndLogEx(INFO, "Figurine Type ID %u and Figurine ID %u ", ftid, ffid);
if (t1) if (t1)
fid = 0x01; fid = 0x01;
if (t2) if (t2)