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

enable fingerprint for UL-C tags too

Browse source
This commit is contained in:
iceman1001 2023-06-11 22:59:10 +02:00
commit 3de4f5225b
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/src/cmdhfmfu.c
View file

@ -1305,10 +1305,10 @@ typedef struct {
} mfu_otp_identify_t; } mfu_otp_identify_t;
static mfu_otp_identify_t mfu_otp_ident_table[] = { static mfu_otp_identify_t mfu_otp_ident_table[] = {
{ "SALTO", 12, 4, "534C544F", ul_c_otpgenA, NULL }, { "SALTO tag", 12, 4, "534C544F", ul_c_otpgenA, NULL },
// { "SAFLOK", 12, 4, NULL, ul_c_otpgenB, NULL }, // { "SAFLOK tag", 12, 4, NULL, ul_c_otpgenB, NULL },
// { "VINGCARD", 12, 4, NULL, ul_c_otpgenC, NULL }, // { "VINGCARD tag", 12, 4, NULL, ul_c_otpgenC, NULL },
// { "DORMA KABA", 12, 4, NULL, ul_c_otpgenD, NULL }, // { "DORMA KABA tag", 12, 4, NULL, ul_c_otpgenD, NULL },
{ NULL, 0, 0, NULL, NULL, NULL } { NULL, 0, 0, NULL, NULL, NULL }
}; };
@ -1827,6 +1827,8 @@ static int CmdHF14AMfUInfo(const char *Cmd) {
else else
locked = true; locked = true;
mfu_fingerprint(tagtype, has_auth_key, authkeyptr, ak_len);
if ((tagtype & MAGIC)) { if ((tagtype & MAGIC)) {
//just read key //just read key
uint8_t ulc_deskey[16] = {0x00}; uint8_t ulc_deskey[16] = {0x00};
@ -3622,10 +3624,10 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
} }
} }
PrintAndLogEx(INFO, "------------------.---------------"); PrintAndLogEx(INFO, "------------------.------------------");
PrintAndLogEx(INFO, " Using UID 4b: " _YELLOW_("%s"), sprint_hex(uid, 4)); PrintAndLogEx(INFO, " Using UID 4b: " _YELLOW_("%s"), sprint_hex(uid, 4));
PrintAndLogEx(INFO, " Using UID 7b: " _YELLOW_("%s"), sprint_hex(uid, 7)); PrintAndLogEx(INFO, " Using UID 7b: " _YELLOW_("%s"), sprint_hex(uid, 7));
PrintAndLogEx(INFO, "----------------------------------"); PrintAndLogEx(INFO, "-------------------------------------");
PrintAndLogEx(INFO, " algo | pwd | pack"); PrintAndLogEx(INFO, " algo | pwd | pack");
PrintAndLogEx(INFO, "--------------------+----------+-----"); PrintAndLogEx(INFO, "--------------------+----------+-----");
PrintAndLogEx(INFO, " Transport EV1 | %08X | %04X", ul_ev1_pwdgenA(uid), ul_ev1_packgenA(uid)); PrintAndLogEx(INFO, " Transport EV1 | %08X | %04X", ul_ev1_pwdgenA(uid), ul_ev1_packgenA(uid));
@ -3643,7 +3645,7 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
PrintAndLogEx(INFO, " SALTO algo"); PrintAndLogEx(INFO, " SALTO algo");
PrintAndLogEx(INFO, " Dorma Kaba algo"); PrintAndLogEx(INFO, " Dorma Kaba algo");
PrintAndLogEx(INFO, " STiD algo"); PrintAndLogEx(INFO, " STiD algo");
PrintAndLogEx(INFO, "----------------------------------"); PrintAndLogEx(INFO, "-------------------------------------");
return PM3_SUCCESS; return PM3_SUCCESS;
} }