From 3de4f5225b36e3754c920651cc9af82441f1cb96 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sun, 11 Jun 2023 22:59:10 +0200 Subject: [PATCH] enable fingerprint for UL-C tags too --- client/src/cmdhfmfu.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index 94494ac3f..e17032507 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -1305,10 +1305,10 @@ typedef struct { } mfu_otp_identify_t; static mfu_otp_identify_t mfu_otp_ident_table[] = { - { "SALTO", 12, 4, "534C544F", ul_c_otpgenA, NULL }, -// { "SAFLOK", 12, 4, NULL, ul_c_otpgenB, NULL }, -// { "VINGCARD", 12, 4, NULL, ul_c_otpgenC, NULL }, -// { "DORMA KABA", 12, 4, NULL, ul_c_otpgenD, NULL }, + { "SALTO tag", 12, 4, "534C544F", ul_c_otpgenA, NULL }, +// { "SAFLOK tag", 12, 4, NULL, ul_c_otpgenB, NULL }, +// { "VINGCARD tag", 12, 4, NULL, ul_c_otpgenC, NULL }, +// { "DORMA KABA tag", 12, 4, NULL, ul_c_otpgenD, NULL }, { NULL, 0, 0, NULL, NULL, NULL } }; @@ -1827,6 +1827,8 @@ static int CmdHF14AMfUInfo(const char *Cmd) { else locked = true; + mfu_fingerprint(tagtype, has_auth_key, authkeyptr, ak_len); + if ((tagtype & MAGIC)) { //just read key 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 7b: " _YELLOW_("%s"), sprint_hex(uid, 7)); - PrintAndLogEx(INFO, "----------------------------------"); + PrintAndLogEx(INFO, "-------------------------------------"); PrintAndLogEx(INFO, " algo | pwd | pack"); PrintAndLogEx(INFO, "--------------------+----------+-----"); 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, " Dorma Kaba algo"); PrintAndLogEx(INFO, " STiD algo"); - PrintAndLogEx(INFO, "----------------------------------"); + PrintAndLogEx(INFO, "-------------------------------------"); return PM3_SUCCESS; }