From 28ecc8fea86ceb673820b6bcb7df9125c3e79d13 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 11 Sep 2020 16:38:12 +0200 Subject: [PATCH] renamed gen3, textual --- client/src/cmdhfmf.c | 51 +++++++++++++++++----------------- client/src/mifare/mifarehost.c | 4 +-- client/src/mifare/mifarehost.h | 4 +-- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index 0637599fc..7e635b503 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -512,7 +512,7 @@ static int usage_hf14_gen3uid(void) { PrintAndLogEx(NORMAL, _YELLOW_(" hf mf gen3uid 01020304050607")); return PM3_SUCCESS; } -static int usage_hf14_gen3blk(void) { +static int usage_hf14_gen3block(void) { PrintAndLogEx(NORMAL, "Overwrite full manufacturer block for magic GEN 3 card"); PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "Usage: hf mf gen3blk [h] [block data (up to 32 hex symbols)]"); @@ -531,15 +531,15 @@ static int usage_hf14_gen3blk(void) { PrintAndLogEx(NORMAL, _YELLOW_(" hf mf gen3blk")); return PM3_SUCCESS; } -static int usage_hf14_gen3freez(void) { - PrintAndLogEx(NORMAL, "Lock further UID changes. No more UID changes available after operation completed"); +static int usage_hf14_gen3freeze(void) { + PrintAndLogEx(NORMAL, "Perma lock further UID changes. No more UID changes available after operation completed"); PrintAndLogEx(NORMAL, ""); - PrintAndLogEx(NORMAL, "Usage: hf mf gen3freez [h] "); + PrintAndLogEx(NORMAL, "Usage: hf mf gen3freeze [h] "); PrintAndLogEx(NORMAL, "Options:"); PrintAndLogEx(NORMAL, " h this help"); - PrintAndLogEx(NORMAL, " confirm UID locks operation"); + PrintAndLogEx(NORMAL, " confirm UID locks operation"); PrintAndLogEx(NORMAL, "Examples:"); - PrintAndLogEx(NORMAL, _YELLOW_(" hf mf gen3freez Y")); + PrintAndLogEx(NORMAL, _YELLOW_(" hf mf gen3freeze y")); return PM3_SUCCESS; } @@ -5159,18 +5159,18 @@ static int CmdHf14AGen3UID(const char *Cmd) { return PM3_SUCCESS; } -static int CmdHf14AGen3Blk(const char *Cmd) { +static int CmdHf14AGen3Block(const char *Cmd) { uint8_t block[16] = {0x00}; int blocklen = 0; uint8_t newBlock[16] = {0x00}; char ctmp = tolower(param_getchar(Cmd, 0)); - if (ctmp == 'h') return usage_hf14_gen3blk(); + if (ctmp == 'h') return usage_hf14_gen3block(); if (ctmp != '\0' && param_gethex_to_eol(Cmd, 0, block, sizeof(block), &blocklen)) - return usage_hf14_gen3blk(); + return usage_hf14_gen3block(); - int res = mfGen3Blk(block, blocklen, newBlock); + int res = mfGen3Block(block, blocklen, newBlock); if (res) { PrintAndLogEx(ERR, "Can't change manufacturer block data. Error=%d", res); return PM3_ESOFT; @@ -5180,18 +5180,17 @@ static int CmdHf14AGen3Blk(const char *Cmd) { return PM3_SUCCESS; } -static int CmdHf14AGen3Freez(const char *Cmd) { - char ctmp = param_getchar(Cmd, 0); - if (tolower(ctmp) == 'h') return usage_hf14_gen3freez(); - if (ctmp != 'Y') return usage_hf14_gen3freez(); +static int CmdHf14AGen3Freeze(const char *Cmd) { + char ctmp = tolower(param_getchar(Cmd, 0)); + if (ctmp == 'h') return usage_hf14_gen3freeze(); + if (ctmp != 'y') return usage_hf14_gen3freeze(); - int res = mfGen3Freez(); + int res = mfGen3Freeze(); if (res) { PrintAndLogEx(ERR, "Can't lock UID changes. Error=%d", res); return PM3_ESOFT; } - - PrintAndLogEx(SUCCESS, "Gen 3 UID locked"); + PrintAndLogEx(SUCCESS, "MFC Gen3 UID permalocked"); return PM3_SUCCESS; } @@ -5232,18 +5231,18 @@ static command_t CommandTable[] = { {"ecfill", CmdHF14AMfECFill, IfPm3Iso14443a, "Fill simulator memory with help of keys from simulator"}, {"ekeyprn", CmdHF14AMfEKeyPrn, IfPm3Iso14443a, "Print keys from simulator memory"}, {"-----------", CmdHelp, IfPm3Iso14443a, "----------------------- " _CYAN_("magic") " -----------------------"}, - {"csetuid", CmdHF14AMfCSetUID, IfPm3Iso14443a, "Set UID (magic chinese card)"}, + {"csetuid", CmdHF14AMfCSetUID, IfPm3Iso14443a, "Set UID"}, {"cwipe", CmdHF14AMfCWipe, IfPm3Iso14443a, "Wipe card to default UID/Sectors/Keys"}, - {"csetblk", CmdHF14AMfCSetBlk, IfPm3Iso14443a, "Write block (magic chinese card)"}, - {"cgetblk", CmdHF14AMfCGetBlk, IfPm3Iso14443a, "Read block (magic chinese card)"}, - {"cgetsc", CmdHF14AMfCGetSc, IfPm3Iso14443a, "Read sector (magic chinese card)"}, - {"cload", CmdHF14AMfCLoad, IfPm3Iso14443a, "Load dump (magic chinese card)"}, - {"csave", CmdHF14AMfCSave, IfPm3Iso14443a, "Save dump from magic chinese card into file or emulator"}, + {"csetblk", CmdHF14AMfCSetBlk, IfPm3Iso14443a, "Write block"}, + {"cgetblk", CmdHF14AMfCGetBlk, IfPm3Iso14443a, "Read block"}, + {"cgetsc", CmdHF14AMfCGetSc, IfPm3Iso14443a, "Read sector"}, + {"cload", CmdHF14AMfCLoad, IfPm3Iso14443a, "Load dump"}, + {"csave", CmdHF14AMfCSave, IfPm3Iso14443a, "Save dump from card into file or emulator"}, {"cview", CmdHF14AMfCView, IfPm3Iso14443a, "view card"}, {"-----------", CmdHelp, IfPm3Iso14443a, "----------------------- " _CYAN_("magic gen3") " -----------------------"}, - {"gen3uid", CmdHf14AGen3UID, IfPm3Iso14443a, "Set UID without manufacturer block (magic gen3 card)"}, - {"gen3blk", CmdHf14AGen3Blk, IfPm3Iso14443a, "Overwrite full manufacturer block (magic gen 3 card)"}, - {"gen3freez", CmdHf14AGen3Freez, IfPm3Iso14443a, "Lock further UID changes (magic gen 3 card)"}, + {"gen3uid", CmdHf14AGen3UID, IfPm3Iso14443a, "Set UID without manufacturer block"}, + {"gen3blk", CmdHf14AGen3Block, IfPm3Iso14443a, "Overwrite full manufacturer block"}, + {"gen3freeze", CmdHf14AGen3Freeze, IfPm3Iso14443a, "Perma lock further UID changes"}, {"-----------", CmdHelp, IfPm3Iso14443a, "----------------------- " _CYAN_("i") " -----------------------"}, {"ice", CmdHF14AMfice, IfPm3Iso14443a, "collect MIFARE Classic nonces to file"}, diff --git a/client/src/mifare/mifarehost.c b/client/src/mifare/mifarehost.c index ed83a6498..7a14c3100 100644 --- a/client/src/mifare/mifarehost.c +++ b/client/src/mifare/mifarehost.c @@ -959,7 +959,7 @@ int mfGen3UID(uint8_t *uid, uint8_t uidlen, uint8_t *oldUid) { } } -int mfGen3Blk(uint8_t *block, int blockLen, uint8_t *newBlock) { +int mfGen3Block(uint8_t *block, int blockLen, uint8_t *newBlock) { clearCommandBuffer(); SendCommandMIX(CMD_HF_MIFARE_GEN3BLK, blockLen, 0, 0, block, 16); PacketResponseNG resp; @@ -974,7 +974,7 @@ int mfGen3Blk(uint8_t *block, int blockLen, uint8_t *newBlock) { } } -int mfGen3Freez(void) { +int mfGen3Freeze(void) { clearCommandBuffer(); SendCommandNG(CMD_HF_MIFARE_GEN3FREEZ, NULL, 0); PacketResponseNG resp; diff --git a/client/src/mifare/mifarehost.h b/client/src/mifare/mifarehost.h index 4864d9357..f6a840550 100644 --- a/client/src/mifare/mifarehost.h +++ b/client/src/mifare/mifarehost.h @@ -81,8 +81,8 @@ int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params); int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params); int mfGen3UID(uint8_t *uid, uint8_t uidlen, uint8_t *oldUid); -int mfGen3Blk(uint8_t *block, int blockLen, uint8_t *newBlock); -int mfGen3Freez(void); +int mfGen3Block(uint8_t *block, int blockLen, uint8_t *newBlock); +int mfGen3Freeze(void); int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);