RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-01 02:27:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

text

Browse source
This commit is contained in:
iceman1001 2020-10-12 01:09:16 +02:00
parent 539c376dd3
commit cb18c4cbd9
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client/src/cmdlfem4x.c
View file

@ -1399,7 +1399,7 @@ static void printEM4x05info(uint32_t block0, uint32_t serial) {
uint8_t chipType = (block0 >> 1) & 0xF; uint8_t chipType = (block0 >> 1) & 0xF;
uint8_t cap = (block0 >> 5) & 3; uint8_t cap = (block0 >> 5) & 3;
uint16_t custCode = (block0 >> 9) & 0x3FF; uint16_t custCode = (block0 >> 9) & 0x2FF;
PrintAndLogEx(INFO, " block0: %X", block0); PrintAndLogEx(INFO, " block0: %X", block0);
PrintAndLogEx(INFO, " chiptype: %X", chipType); PrintAndLogEx(INFO, " chiptype: %X", chipType);
@ -1414,6 +1414,7 @@ static void printEM4x05info(uint32_t block0, uint32_t serial) {
// 9 - 18 customer code // 9 - 18 customer code
// 19, rfu // 19, rfu
98765432109876543210
001000000000 001000000000
// 00100000000001111000 // 00100000000001111000
// 1100 // 1100
@ -1548,8 +1549,8 @@ static int CmdEM4x05Chk(const char *Cmd) {
CLIParserInit(&ctx, "lf em 4x05_chk", CLIParserInit(&ctx, "lf em 4x05_chk",
"This command uses a dictionary attack against EM4205/4305/4469/4569", "This command uses a dictionary attack against EM4205/4305/4469/4569",
"lf em 4x05_chk\n" "lf em 4x05_chk\n"
"lf em 4x05_chk -e aa11223344\n" "lf em 4x05_chk -e 0x00000022B8 -> remember to use 0x for hex\n"
"lf em 4x05_chk -f t55xx_default_pwds" "lf em 4x05_chk -f t55xx_default_pwds -> use T55xx default dictionary"
); );
void *argtable[] = { void *argtable[] = {
@ -1568,13 +1569,11 @@ static int CmdEM4x05Chk(const char *Cmd) {
if (strlen(filename) == 0) { if (strlen(filename) == 0) {
snprintf(filename, sizeof(filename), "t55xx_default_pwds"); snprintf(filename, sizeof(filename), "t55xx_default_pwds");
} }
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
uint8_t addr = 4; uint8_t addr = 4;
uint32_t word = 0; uint32_t word = 0;
bool found = false; bool found = false;
uint64_t t1 = msclock(); uint64_t t1 = msclock();
// White cloner password based on EM4100 ID // White cloner password based on EM4100 ID