mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-19 21:03:48 -07:00
hf jooki - encode / decode ...
This commit is contained in:
iceman1001
parent
d8e39b19b3
commit
c576a0065b
7 changed files with 433 additions and 21 deletions
|
|
@ -242,6 +242,7 @@ set (TARGET_SOURCES
|
||||||
${PM3_ROOT}/client/src/cmdhffelica.c
|
${PM3_ROOT}/client/src/cmdhffelica.c
|
||||||
${PM3_ROOT}/client/src/cmdhffido.c
|
${PM3_ROOT}/client/src/cmdhffido.c
|
||||||
${PM3_ROOT}/client/src/cmdhficlass.c
|
${PM3_ROOT}/client/src/cmdhficlass.c
|
||||||
|
${PM3_ROOT}/client/src/cmdhfjooki.c
|
||||||
${PM3_ROOT}/client/src/cmdhflegic.c
|
${PM3_ROOT}/client/src/cmdhflegic.c
|
||||||
${PM3_ROOT}/client/src/cmdhflist.c
|
${PM3_ROOT}/client/src/cmdhflist.c
|
||||||
${PM3_ROOT}/client/src/cmdhflto.c
|
${PM3_ROOT}/client/src/cmdhflto.c
|
||||||
|
|
|
||||||
|
|
@ -474,6 +474,7 @@ SRCS = aiddesfire.c \
|
||||||
cmdhffido.c \
|
cmdhffido.c \
|
||||||
cmdhficlass.c \
|
cmdhficlass.c \
|
||||||
cmdhflegic.c \
|
cmdhflegic.c \
|
||||||
|
cmdhfjooki.c \
|
||||||
cmdhflist.c \
|
cmdhflist.c \
|
||||||
cmdhflto.c \
|
cmdhflto.c \
|
||||||
cmdhfmf.c \
|
cmdhfmf.c \
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@
|
||||||
#include "cmdhfemrtd.h" // eMRTD
|
#include "cmdhfemrtd.h" // eMRTD
|
||||||
#include "cmdhflegic.h" // LEGIC
|
#include "cmdhflegic.h" // LEGIC
|
||||||
#include "cmdhficlass.h" // ICLASS
|
#include "cmdhficlass.h" // ICLASS
|
||||||
|
#include "cmdhfjooki.h" // MFU based Jooki
|
||||||
#include "cmdhfmf.h" // CLASSIC
|
#include "cmdhfmf.h" // CLASSIC
|
||||||
#include "cmdhfmfu.h" // ULTRALIGHT/NTAG etc
|
#include "cmdhfmfu.h" // ULTRALIGHT/NTAG etc
|
||||||
#include "cmdhfmfp.h" // Mifare Plus
|
#include "cmdhfmfp.h" // Mifare Plus
|
||||||
|
|
@ -397,6 +398,7 @@ static command_t CommandTable[] = {
|
||||||
{"emrtd", CmdHFeMRTD, AlwaysAvailable, "{ Machine Readable Travel Document... }"},
|
{"emrtd", CmdHFeMRTD, AlwaysAvailable, "{ Machine Readable Travel Document... }"},
|
||||||
{"felica", CmdHFFelica, AlwaysAvailable, "{ ISO18092 / FeliCa RFIDs... }"},
|
{"felica", CmdHFFelica, AlwaysAvailable, "{ ISO18092 / FeliCa RFIDs... }"},
|
||||||
{"fido", CmdHFFido, AlwaysAvailable, "{ FIDO and FIDO2 authenticators... }"},
|
{"fido", CmdHFFido, AlwaysAvailable, "{ FIDO and FIDO2 authenticators... }"},
|
||||||
|
{"jooki", CmdHF_Jooki, AlwaysAvailable, "{ Jooki RFIDs... }"},
|
||||||
{"iclass", CmdHFiClass, AlwaysAvailable, "{ ICLASS RFIDs... }"},
|
{"iclass", CmdHFiClass, AlwaysAvailable, "{ ICLASS RFIDs... }"},
|
||||||
{"legic", CmdHFLegic, AlwaysAvailable, "{ LEGIC RFIDs... }"},
|
{"legic", CmdHFLegic, AlwaysAvailable, "{ LEGIC RFIDs... }"},
|
||||||
{"lto", CmdHFLTO, AlwaysAvailable, "{ LTO Cartridge Memory RFIDs... }"},
|
{"lto", CmdHFLTO, AlwaysAvailable, "{ LTO Cartridge Memory RFIDs... }"},
|
||||||
|
|
|
||||||
357
client/src/cmdhfjooki.c
Normal file
357
client/src/cmdhfjooki.c
Normal file
|
|
@ -0,0 +1,357 @@
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Ultralight Code (c) 2021 Iceman
|
||||||
|
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
||||||
|
// at your option, any later version. See the LICENSE.txt file for the text of
|
||||||
|
// the license.
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// High frequency MIFARE ULTRALIGHT / Jooki commands
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
#include "cmdhfjooki.h"
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <string.h> // memset
|
||||||
|
#include "commonutil.h" // ARRAYLEN
|
||||||
|
#include "ui.h" // PrintAndLog
|
||||||
|
#include "cmdparser.h"
|
||||||
|
#include "generator.h"
|
||||||
|
#include "base64.h"
|
||||||
|
#include "mifare/ndef.h" // print decode ndef
|
||||||
|
#include "cliparser.h"
|
||||||
|
#include "cmdhfmfu.h"
|
||||||
|
#include "cmdmain.h"
|
||||||
|
|
||||||
|
static int CmdHelp(const char *Cmd);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint8_t uid[7];
|
||||||
|
const char b64[17];
|
||||||
|
uint8_t tagtype;
|
||||||
|
} PACKED jooki_t;
|
||||||
|
|
||||||
|
// sample set for selftest.
|
||||||
|
jooki_t jooks[] = {
|
||||||
|
{ {0x04, 0xDA, 0xB7, 0x6A, 0xE7, 0x4C, 0x80}, "ruxow8lnn88uyeX+", 0x00},
|
||||||
|
{ {0x04, 0xf0, 0x22, 0xc2, 0x33, 0x5e, 0x80}, "\0" , 0x00},
|
||||||
|
{ {0x04, 0x8C, 0xEC, 0xDA, 0xF0, 0x4A, 0x80}, "ONrsVf7jX6IaSNV6", 0x01},
|
||||||
|
{ {0x04, 0x92, 0xA7, 0x6A, 0xE7, 0x4C, 0x81}, "Hjjpcx/mZwuveTF+", 0x02},
|
||||||
|
{ {0x04, 0xD0, 0xB0, 0x3A, 0xD3, 0x63, 0x80}, "\0", 0x02},
|
||||||
|
{ {0x04, 0x96, 0x42, 0xDA, 0xF0, 0x4A, 0x80}, "vEWy0WO9wZNEzEok", 0x03},
|
||||||
|
{ {0x04, 0x33, 0xb5, 0x62, 0x39, 0x4d, 0x80}, "\0", 0x03},
|
||||||
|
{ {0x04, 0x17, 0xB7, 0x3A, 0xD3, 0x63, 0x81}, "f0axEma+g2WnLGAm", 0x05},
|
||||||
|
{ {0x04, 0x84, 0x27, 0x6A, 0xE7, 0x4C, 0x80}, "VZB/OLBwOiM5Mpnp", 0x05},
|
||||||
|
{ {0x04, 0x28, 0xF4, 0xDA, 0xF0, 0x4A, 0x81}, "7WzlgEzqLgwTnWNy", 0x05},
|
||||||
|
};
|
||||||
|
|
||||||
|
const char *jooks_figures[] = {"Dragon", "Fox", "Ghost", "Knight", "?", "Whale"};
|
||||||
|
const uint8_t jooki_secret[] = {0x20, 0x20, 0x20, 0x6D, 0x24, 0x0B, 0xEB, 0x94, 0x2C, 0x80, 0x45, 0x16};
|
||||||
|
const uint8_t NFC_SECRET[] = { 0x03, 0x9c, 0x25, 0x6f, 0xb9, 0x2e, 0xe8, 0x08, 0x09, 0x83, 0xd9, 0x33, 0x56};
|
||||||
|
|
||||||
|
#define JOOKI_UID_LEN 7
|
||||||
|
#define JOOKI_IV_LEN 4
|
||||||
|
#define JOOKI_B64_LEN (16 + 1)
|
||||||
|
#define JOOKI_PLAIN_LEN 12
|
||||||
|
|
||||||
|
static int jooki_encode(uint8_t *iv, uint8_t tagtype, uint8_t *uid, char *out) {
|
||||||
|
if (out == NULL) {
|
||||||
|
PrintAndLogEx(ERR, "(encode jooki) base64ndef param is NULL");
|
||||||
|
return PM3_EINVARG;
|
||||||
|
}
|
||||||
|
|
||||||
|
out[0] = 0x00;
|
||||||
|
if (iv == NULL || uid == NULL) {
|
||||||
|
PrintAndLogEx(ERR, "(encode jooki) iv or uid param is NULL");
|
||||||
|
return PM3_EINVARG;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t d[JOOKI_PLAIN_LEN] = {iv[0], iv[1],iv[2], iv[3], tagtype, uid[0], uid[1], uid[2], uid[3], uid[4], uid[5], uid[6]};
|
||||||
|
uint8_t enc[JOOKI_PLAIN_LEN] = {0};
|
||||||
|
for (uint8_t i = 0; i < JOOKI_PLAIN_LEN; i++) {
|
||||||
|
|
||||||
|
if (i < 3)
|
||||||
|
enc[i] = d[i] ^ NFC_SECRET[i];
|
||||||
|
else
|
||||||
|
enc[i] = d[i] ^ NFC_SECRET[i] ^ d[i % 3];
|
||||||
|
}
|
||||||
|
|
||||||
|
PrintAndLogEx(DEBUG, "encoded result.... %s", sprint_hex(enc, sizeof(enc)));
|
||||||
|
|
||||||
|
size_t b64len = 0;
|
||||||
|
uint8_t b64[20];
|
||||||
|
memset(b64, 0, 20);
|
||||||
|
mbedtls_base64_encode(b64, sizeof(b64), &b64len, (const unsigned char*)enc, sizeof(enc));
|
||||||
|
memcpy(out, b64, b64len);
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int jooki_decode(uint8_t *b64ndef, uint8_t *result) {
|
||||||
|
size_t nlen = strlen(b64ndef);
|
||||||
|
if (nlen != 16) {
|
||||||
|
PrintAndLogEx(ERR, "Invalid input length expected 16, got %zu", nlen);
|
||||||
|
return PM3_EINVARG;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t ndef[JOOKI_PLAIN_LEN] = {0};
|
||||||
|
size_t outputlen = 0;
|
||||||
|
mbedtls_base64_decode(ndef, sizeof(ndef), &outputlen, (const unsigned char*)b64ndef, strlen(b64ndef));
|
||||||
|
|
||||||
|
PrintAndLogEx(DEBUG, "(decode_jooki) raw encoded... " _GREEN_("%s"), sprint_hex(ndef, sizeof(ndef)));
|
||||||
|
|
||||||
|
for (uint8_t i = 0; i < JOOKI_PLAIN_LEN; i++) {
|
||||||
|
if (i < 3)
|
||||||
|
result[i] = ndef[i] ^ NFC_SECRET[i];
|
||||||
|
else
|
||||||
|
result[i] = ndef[i] ^ NFC_SECRET[i] ^ ndef[i % 3] ^ NFC_SECRET[i % 3];
|
||||||
|
}
|
||||||
|
PrintAndLogEx(DEBUG, "(decode_jooki) plain......... %s", sprint_hex(result, sizeof(ndef)));
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int jooki_create_ndef(uint8_t *b64ndef, uint8_t *ndefrecord) {
|
||||||
|
// sample of url: https://s.jooki.rocks/s/?s=ONrsVf7jX6IaSNV6
|
||||||
|
|
||||||
|
size_t nlen = strlen(b64ndef);
|
||||||
|
if (nlen != 16) {
|
||||||
|
PrintAndLogEx(ERR, "(jooki_create_ndef) Invalid input length expected 16, got %zu", nlen);
|
||||||
|
return PM3_EINVARG;
|
||||||
|
}
|
||||||
|
if (ndefrecord == NULL) {
|
||||||
|
PrintAndLogEx(ERR, "(jooki_create_ndef) ndefrecord param is NULL");
|
||||||
|
return PM3_EINVARG;
|
||||||
|
}
|
||||||
|
memcpy(ndefrecord,
|
||||||
|
"\x01\x03\xa0\x0c\x34\x03\x29\xd1"
|
||||||
|
"\x01\x25\x55\x04\x73\x2e\x6a\x6f"
|
||||||
|
"\x6f\x6b\x69\x2e\x72\x6f\x63\x6b"
|
||||||
|
"\x73\x2f\x73\x2f\x3f\x73\x3d", 31);
|
||||||
|
memcpy(ndefrecord + 31, b64ndef, 16);
|
||||||
|
memcpy(ndefrecord + 47, "\x0a\xFE\x00\x00\x00", 5);
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void jooki_printEx(uint8_t *b64, uint8_t *iv, uint8_t tt, uint8_t *uid, bool verbose) {
|
||||||
|
PrintAndLogEx(INFO, "Encoded URL.. %s ( %s )", sprint_hex(b64, 12), b64);
|
||||||
|
PrintAndLogEx(INFO, "Figurine..... %02x - " _GREEN_("%s"), tt, jooks_figures[tt]);
|
||||||
|
PrintAndLogEx(INFO, "iv........... %s", sprint_hex(iv, JOOKI_IV_LEN));
|
||||||
|
PrintAndLogEx(INFO, "uid.......... %s", sprint_hex(uid, JOOKI_UID_LEN));
|
||||||
|
|
||||||
|
uint8_t ndefmsg[52] = {0};
|
||||||
|
jooki_create_ndef(b64, ndefmsg);
|
||||||
|
PrintAndLogEx(INFO, "NDEF raw..... %s", sprint_hex_inrow(ndefmsg, sizeof(ndefmsg)));
|
||||||
|
|
||||||
|
if (verbose) {
|
||||||
|
int res = NDEFRecordsDecodeAndPrint(ndefmsg, sizeof(ndefmsg));
|
||||||
|
if (res != PM3_SUCCESS) {
|
||||||
|
NDEFDecodeAndPrint(ndefmsg, sizeof(ndefmsg), verbose);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void jooki_print(uint8_t *b64, uint8_t *result, bool verbose) {
|
||||||
|
if (b64 == NULL || result == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
uint8_t iv[JOOKI_IV_LEN] = {0};
|
||||||
|
uint8_t uid[JOOKI_UID_LEN] = {0};
|
||||||
|
memcpy(iv, result, sizeof(iv));
|
||||||
|
uint8_t tt = result[4];
|
||||||
|
memcpy(uid, result + 5, sizeof(uid));
|
||||||
|
|
||||||
|
jooki_printEx(b64, iv, tt, uid, verbose);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
static int jooki_write(void) {
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
static int jooki_selftest(void) {
|
||||||
|
|
||||||
|
PrintAndLogEx(INFO, "======== " _CYAN_("selftest") " ===========================================");
|
||||||
|
for (int i = 0; i < ARRAYLEN(jooks); i++) {
|
||||||
|
if (strlen(jooks[i].b64) == 0)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
uint8_t iv[JOOKI_IV_LEN] = {0};
|
||||||
|
uint8_t uid[JOOKI_UID_LEN] = {0};
|
||||||
|
uint8_t result[JOOKI_PLAIN_LEN] = {0};
|
||||||
|
jooki_decode((uint8_t*)jooks[i].b64, result);
|
||||||
|
|
||||||
|
memcpy(iv, result, 4);
|
||||||
|
uint8_t tt = result[4];
|
||||||
|
memcpy(uid, result + 5, sizeof(uid));
|
||||||
|
|
||||||
|
bool tt_ok = (tt == jooks[i].tagtype);
|
||||||
|
bool uid_ok = (memcmp(uid, jooks[i].uid, sizeof(uid)) == 0);
|
||||||
|
|
||||||
|
PrintAndLogEx(INFO, "Encoded URL.. %s ( %s )", sprint_hex((const uint8_t*)jooks[i].b64, 12), jooks[i].b64);
|
||||||
|
PrintAndLogEx(INFO, "Figurine..... %02x - " _GREEN_("%s") " ( %s )", tt, jooks_figures[tt], tt_ok ? _GREEN_("ok") : _RED_("fail"));
|
||||||
|
PrintAndLogEx(INFO, "iv........... %s", sprint_hex(iv, sizeof(iv)));
|
||||||
|
PrintAndLogEx(INFO, "uid.......... %s ( %s )", sprint_hex(uid, sizeof(uid)), uid_ok ? _GREEN_("ok") : _RED_("fail"));
|
||||||
|
|
||||||
|
uint8_t b64[JOOKI_B64_LEN] = {0};
|
||||||
|
memset(b64, 0, sizeof(b64));
|
||||||
|
jooki_encode(iv, tt, uid, b64);
|
||||||
|
|
||||||
|
uint8_t ndefmsg[52] = {0};
|
||||||
|
jooki_create_ndef(b64, ndefmsg);
|
||||||
|
PrintAndLogEx(INFO, "NDEF raw .... %s", sprint_hex(ndefmsg, sizeof(ndefmsg)));
|
||||||
|
|
||||||
|
int status = NDEFRecordsDecodeAndPrint(ndefmsg, sizeof(ndefmsg));
|
||||||
|
if ( status != PM3_SUCCESS) {
|
||||||
|
status = NDEFDecodeAndPrint(ndefmsg, sizeof(ndefmsg), true);
|
||||||
|
}
|
||||||
|
PrintAndLogEx(INFO, "==================================================================");
|
||||||
|
}
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int CmdHF14AJookiEncode(const char *Cmd) {
|
||||||
|
CLIParserContext *ctx;
|
||||||
|
CLIParserInit(&ctx, "hf jooki Encode",
|
||||||
|
"Encode a Jooki token to base64 NDEF URI format",
|
||||||
|
"hf jooki encode -t --> selftest\n"
|
||||||
|
"hf jooki encode -r --dragon --> read uid from tag and use for encoding\n"
|
||||||
|
"hf jooki encode --uid 04010203040506 --dragon"
|
||||||
|
);
|
||||||
|
|
||||||
|
void *argtable[] = {
|
||||||
|
arg_param_begin,
|
||||||
|
arg_str0("u", "uid", "<hex>", "uid bytes"),
|
||||||
|
arg_lit0("r", NULL, "read uid from tag instead"),
|
||||||
|
arg_lit0("t", NULL, "selftest"),
|
||||||
|
arg_lit0("v", "verbose", "verbose output"),
|
||||||
|
arg_lit0(NULL, "dragon", "tag type"),
|
||||||
|
arg_lit0(NULL, "fox", "tag type"),
|
||||||
|
arg_lit0(NULL, "ghost", "tag type"),
|
||||||
|
arg_lit0(NULL, "knight", "tag type"),
|
||||||
|
arg_lit0(NULL, "whale", "tag type"),
|
||||||
|
arg_param_end
|
||||||
|
};
|
||||||
|
CLIExecWithReturn(ctx, Cmd, argtable, false);
|
||||||
|
int ulen = 0;
|
||||||
|
uint8_t uid[JOOKI_UID_LEN] = {0x00};
|
||||||
|
memset(uid, 0x0, sizeof(uid));
|
||||||
|
CLIParamHexToBuf(arg_get_str(ctx, 1), uid, sizeof(uid), &ulen);
|
||||||
|
|
||||||
|
bool use_tag = arg_get_lit(ctx, 2);
|
||||||
|
bool selftest = arg_get_lit(ctx, 3);
|
||||||
|
bool verbose = arg_get_lit(ctx, 4);
|
||||||
|
bool tt_dragon = arg_get_lit(ctx, 5);
|
||||||
|
bool tt_fox = arg_get_lit(ctx, 6);
|
||||||
|
bool tt_ghost = arg_get_lit(ctx, 7);
|
||||||
|
bool tt_knight = arg_get_lit(ctx, 8);
|
||||||
|
bool tt_whale = arg_get_lit(ctx, 9);
|
||||||
|
CLIParserFree(ctx);
|
||||||
|
|
||||||
|
if (selftest) {
|
||||||
|
return jooki_selftest();
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((tt_dragon + tt_fox + tt_ghost + tt_knight + tt_whale) > 1) {
|
||||||
|
PrintAndLogEx(ERR, "Select one tag type");
|
||||||
|
return PM3_EINVARG;
|
||||||
|
}
|
||||||
|
uint8_t tt = 0;
|
||||||
|
if (tt_fox)
|
||||||
|
tt = 1;
|
||||||
|
if (tt_ghost)
|
||||||
|
tt = 2;
|
||||||
|
if (tt_knight)
|
||||||
|
tt = 3;
|
||||||
|
if (tt_whale)
|
||||||
|
tt = 5;
|
||||||
|
|
||||||
|
uint8_t iv[JOOKI_IV_LEN] = {0x31, 0x43, 0x33, 0};
|
||||||
|
if (use_tag) {
|
||||||
|
int res = ul_read_uid(uid);
|
||||||
|
if (res != PM3_SUCCESS) {
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (ulen != JOOKI_UID_LEN) {
|
||||||
|
PrintAndLogEx(ERR, "Wrong length of UID, expect %u, got %d", JOOKI_UID_LEN, ulen);
|
||||||
|
return PM3_EINVARG;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t b64[JOOKI_B64_LEN] = {0};
|
||||||
|
memset(b64, 0, sizeof(b64));
|
||||||
|
jooki_encode(iv, tt, uid, b64);
|
||||||
|
jooki_printEx(b64, iv, tt, uid, verbose);
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int CmdHF14AJookiDecode(const char *Cmd) {
|
||||||
|
CLIParserContext *ctx;
|
||||||
|
CLIParserInit(&ctx, "hf jooki decode",
|
||||||
|
"Decode a base64-encode Jooki token in NDEF URI format",
|
||||||
|
"hf jooki decode -d 7WzlgEzqLgwTnWNy"
|
||||||
|
);
|
||||||
|
|
||||||
|
void *argtable[] = {
|
||||||
|
arg_param_begin,
|
||||||
|
arg_str1("d", "data", "<hex>", "base64 url parameter"),
|
||||||
|
arg_lit0("v", "verbose", "verbose output"),
|
||||||
|
arg_param_end
|
||||||
|
};
|
||||||
|
CLIExecWithReturn(ctx, Cmd, argtable, false);
|
||||||
|
int dlen = 16;
|
||||||
|
uint8_t b64[JOOKI_B64_LEN] = {0x00};
|
||||||
|
memset(b64, 0x0, sizeof(b64));
|
||||||
|
CLIGetStrWithReturn(ctx, 1, b64, &dlen);
|
||||||
|
bool verbose = arg_get_lit(ctx, 2);
|
||||||
|
CLIParserFree(ctx);
|
||||||
|
|
||||||
|
uint8_t result[JOOKI_PLAIN_LEN] = {0};
|
||||||
|
int res = jooki_decode(b64, result);
|
||||||
|
if (res == PM3_SUCCESS) {
|
||||||
|
jooki_print(b64, result, verbose);
|
||||||
|
}
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int CmdHF14AJookiWrite(const char *Cmd) {
|
||||||
|
CLIParserContext *ctx;
|
||||||
|
CLIParserInit(&ctx, "hf jooki write",
|
||||||
|
"Write a Jooki token to a Ultralight or NTAG tag",
|
||||||
|
"hf jooki write"
|
||||||
|
);
|
||||||
|
|
||||||
|
void *argtable[] = {
|
||||||
|
arg_param_begin,
|
||||||
|
arg_str1("d", "data", "<hex>", "bytes"),
|
||||||
|
arg_param_end
|
||||||
|
};
|
||||||
|
CLIExecWithReturn(ctx, Cmd, argtable, true);
|
||||||
|
int dlen = 0;
|
||||||
|
uint8_t data[100] = {0x00};
|
||||||
|
memset(data, 0x0, sizeof(data));
|
||||||
|
int res = CLIParamHexToBuf(arg_get_str(ctx, 1), data, sizeof(data), &dlen);
|
||||||
|
if (res) {
|
||||||
|
CLIParserFree(ctx);
|
||||||
|
PrintAndLogEx(FAILED, "Error parsing bytes");
|
||||||
|
return PM3_EINVARG;
|
||||||
|
}
|
||||||
|
|
||||||
|
CLIParserFree(ctx);
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static command_t CommandTable[] = {
|
||||||
|
{"help", CmdHelp, AlwaysAvailable, "This help"},
|
||||||
|
{"encode", CmdHF14AJookiEncode, AlwaysAvailable, "Encode Jooki token"},
|
||||||
|
{"decode", CmdHF14AJookiDecode, AlwaysAvailable, "Decode Jooki token"},
|
||||||
|
{"write", CmdHF14AJookiWrite, IfPm3Iso14443a, "Write a Jooki token"},
|
||||||
|
{NULL, NULL, NULL, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
static int CmdHelp(const char *Cmd) {
|
||||||
|
(void)Cmd; // Cmd is not used so far
|
||||||
|
CmdsHelp(CommandTable);
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
int CmdHF_Jooki(const char *Cmd) {
|
||||||
|
clearCommandBuffer();
|
||||||
|
return CmdsParse(CommandTable, Cmd);
|
||||||
|
}
|
||||||
16
client/src/cmdhfjooki.h
Normal file
16
client/src/cmdhfjooki.h
Normal file
|
|
@ -0,0 +1,16 @@
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Copyright (C) 2021 iceman1001
|
||||||
|
//
|
||||||
|
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
||||||
|
// at your option, any later version. See the LICENSE.txt file for the text of
|
||||||
|
// the license.
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// High frequency ISO14443A / MFU / Jooki commands
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#ifndef CMDHFJOOKI_H__
|
||||||
|
#define CMDHFJOOKI_H__
|
||||||
|
|
||||||
|
#include "common.h"
|
||||||
|
int CmdHF_Jooki(const char *Cmd);
|
||||||
|
#endif
|
||||||
|
|
@ -115,6 +115,36 @@ static char *getUlev1CardSizeStr(uint8_t fsize) {
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int ul_read_uid(uint8_t *uid) {
|
||||||
|
if (uid == NULL) {
|
||||||
|
PrintAndLogEx(WARNING, "NUll parameter UID");
|
||||||
|
return PM3_ESOFT;
|
||||||
|
}
|
||||||
|
// read uid from tag
|
||||||
|
clearCommandBuffer();
|
||||||
|
SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
|
||||||
|
PacketResponseNG resp;
|
||||||
|
WaitForResponse(CMD_ACK, &resp);
|
||||||
|
iso14a_card_select_t card;
|
||||||
|
memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
|
||||||
|
|
||||||
|
uint64_t select_status = resp.oldarg[0];
|
||||||
|
// 0: couldn't read
|
||||||
|
// 1: OK with ATS
|
||||||
|
// 2: OK, no ATS
|
||||||
|
// 3: proprietary Anticollision
|
||||||
|
if (select_status == 0) {
|
||||||
|
PrintAndLogEx(WARNING, "iso14443a card select failed");
|
||||||
|
return PM3_ESOFT;
|
||||||
|
}
|
||||||
|
if (card.uidlen != 7) {
|
||||||
|
PrintAndLogEx(WARNING, "Wrong sized UID, expected 7bytes got %d", card.uidlen);
|
||||||
|
return PM3_ESOFT;
|
||||||
|
}
|
||||||
|
memcpy(uid, card.uid, 7);
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
static void ul_switch_on_field(void) {
|
static void ul_switch_on_field(void) {
|
||||||
clearCommandBuffer();
|
clearCommandBuffer();
|
||||||
SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
|
SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT | ISO14A_NO_DISCONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
|
||||||
|
|
@ -2759,27 +2789,11 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
|
||||||
|
|
||||||
if (use_tag) {
|
if (use_tag) {
|
||||||
// read uid from tag
|
// read uid from tag
|
||||||
clearCommandBuffer();
|
int res = ul_read_uid(uid);
|
||||||
SendCommandMIX(CMD_HF_ISO14443A_READER, ISO14A_CONNECT | ISO14A_NO_RATS, 0, 0, NULL, 0);
|
if (res != PM3_SUCCESS) {
|
||||||
PacketResponseNG resp;
|
return res;
|
||||||
WaitForResponse(CMD_ACK, &resp);
|
}
|
||||||
iso14a_card_select_t card;
|
|
||||||
memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t));
|
|
||||||
|
|
||||||
uint64_t select_status = resp.oldarg[0];
|
|
||||||
// 0: couldn't read
|
|
||||||
// 1: OK with ATS
|
|
||||||
// 2: OK, no ATS
|
|
||||||
// 3: proprietary Anticollision
|
|
||||||
if (select_status == 0) {
|
|
||||||
PrintAndLogEx(WARNING, "iso14443a card select failed");
|
|
||||||
return PM3_ESOFT;
|
|
||||||
}
|
|
||||||
if (card.uidlen != 7) {
|
|
||||||
PrintAndLogEx(WARNING, "Wrong sized UID, expected 7bytes got %d", card.uidlen);
|
|
||||||
return PM3_ESOFT;
|
|
||||||
}
|
|
||||||
memcpy(uid, card.uid, sizeof(uid));
|
|
||||||
} else {
|
} else {
|
||||||
if (u_len != 7) {
|
if (u_len != 7) {
|
||||||
PrintAndLogEx(WARNING, "Key must be 7 hex bytes");
|
PrintAndLogEx(WARNING, "Key must be 7 hex bytes");
|
||||||
|
|
@ -3539,7 +3553,27 @@ static int CmdHF14MfuNDEF(const char *Cmd) {
|
||||||
}
|
}
|
||||||
|
|
||||||
DropField();
|
DropField();
|
||||||
status = NDEFDecodeAndPrint(records, (size_t)maxsize, true);
|
status = NDEFRecordsDecodeAndPrint(records, (size_t)maxsize);
|
||||||
|
if ( status != PM3_SUCCESS) {
|
||||||
|
status = NDEFDecodeAndPrint(records, (size_t)maxsize, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
char *jooki = strstr(records, "s.jooki.rocks/s/?s=");
|
||||||
|
if (jooki) {
|
||||||
|
jooki += 17;
|
||||||
|
while(jooki) {
|
||||||
|
if ((*jooki) != '=')
|
||||||
|
jooki++;
|
||||||
|
else {
|
||||||
|
jooki++;
|
||||||
|
char s[17] = {0};
|
||||||
|
strncpy(s, jooki, 16);
|
||||||
|
PrintAndLogEx(HINT, "Use `" _YELLOW_("hf jooki decode -d %s") "` to decode", s);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
free(records);
|
free(records);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ typedef struct {
|
||||||
uint32_t GetHF14AMfU_Type(void);
|
uint32_t GetHF14AMfU_Type(void);
|
||||||
int ul_print_type(uint32_t tagtype, uint8_t spaces);
|
int ul_print_type(uint32_t tagtype, uint8_t spaces);
|
||||||
void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage);
|
void printMFUdumpEx(mfu_dump_t *card, uint16_t pages, uint8_t startpage);
|
||||||
|
int ul_read_uid(uint8_t *uid);
|
||||||
|
|
||||||
int CmdHFMFUltra(const char *Cmd);
|
int CmdHFMFUltra(const char *Cmd);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue