rfidrig/proxmark3
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-12 11:18:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

minor textual changes \n and added support for bambu kdf.

Browse Source
This commit is contained in:
iceman1001
2024-11-20 01:49:45 +01:00
parent 328c0b5f07
commit 86e8792f34
9 changed files with 115 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/cmdhfmf.c
+4 -3
View File
@@ -797,7 +797,7 @@ static int mf_load_keys(uint8_t **pkeyBlock, uint32_t *pkeycnt, uint8_t *userkey
PrintAndLogEx(DEBUG, _YELLOW_("%2d") " - %s", *pkeycnt + i, sprint_hex(*pkeyBlock + (*pkeycnt + i) * MIFARE_KEY_SIZE, MIFARE_KEY_SIZE));
}
*pkeycnt += ARRAYLEN(g_mifare_default_keys);
PrintAndLogEx(SUCCESS, "loaded " _GREEN_("%zu") " keys from hardcoded default array", ARRAYLEN(g_mifare_default_keys));
PrintAndLogEx(SUCCESS, "loaded " _GREEN_("%zu") " hardcoded keys", ARRAYLEN(g_mifare_default_keys));
}
// Handle user supplied dictionary file
@@ -883,7 +883,7 @@ static int CmdHF14AMfDarkside(const char *Cmd) {
arg_param_begin,
arg_int0(NULL, "blk", "<dec> ", "Target block"),
arg_lit0("b", NULL, "Target key B instead of default key A"),
arg_int0("c", NULL, "<dec>", "Target key type is key A + offset"),
arg_int0("c", NULL, "<dec>", "Target Auth 6x"),
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
@@ -9697,7 +9697,8 @@ static int CmdHF14AMfInfo(const char *Cmd) {
}
if (fKeyType != 0xFF) {
PrintAndLogEx(SUCCESS, "Block 0.......... %s", sprint_hex_ascii(blockdata, MFBLOCK_SIZE));
PrintAndLogEx(SUCCESS, "Block 0.... %s | " NOLF, sprint_hex_inrow(blockdata, MFBLOCK_SIZE));
PrintAndLogEx(NORMAL, "%s", sprint_ascii(blockdata + 8, 8));
}
PrintAndLogEx(NORMAL, "");
client/src/cmdhfmfu.c
+4 -1
View File
@@ -4126,7 +4126,7 @@ static int CmdHF14AMfUCSetUid(const char *Cmd) {
// save old block2.
uint8_t oldblock2[4] = {0x00};
memcpy(resp.data.asBytes, oldblock2, 4);
memcpy(oldblock2, resp.data.asBytes, 4);
// Enforce bad BCC handling temporarily as BCC will be wrong between
// block 1 write and block2 write
@@ -4431,6 +4431,9 @@ static int CmdHF14AMfUPwdGen(const char *Cmd) {
PrintAndLogEx(INFO, " Dorma Kaba algo");
PrintAndLogEx(INFO, " STiD algo");
PrintAndLogEx(INFO, "-------------------------------------");
key = 0;
mfc_algo_bambu_one(uid, 0, MF_KEY_A, &key);
PrintAndLogEx(INFO, " Bambu........ %012" PRIX64, key);
return PM3_SUCCESS;
}