github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-19 04:49:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chg 'hf mf chk':

Browse source 
* don't repeatedly clear trace while running (PR 243 by @mceloff from https://github.com/RfidResearchGroup/proxmark3)
* standard LED handling
* better check for key file syntax
* get rid of "res" column when printing the result. Show unknown keys more prominent as "     ?     "
This commit is contained in:
pwpiwi 2019-08-10 23:30:47 +02:00 • committed by GitHub
commit f98702bace
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

17
armsrc/mifarecmd.c
View file

@ -980,16 +980,17 @@ void MifareChkKeys(uint16_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
uint8_t set14aTimeout = (arg1 >> 8) & 0xff; uint8_t set14aTimeout = (arg1 >> 8) & 0xff;
uint8_t keyCount = arg2; uint8_t keyCount = arg2;
LED_A_ON();
// clear debug level // clear debug level
int OLD_MF_DBGLEVEL = MF_DBGLEVEL; int OLD_MF_DBGLEVEL = MF_DBGLEVEL;
MF_DBGLEVEL = MF_DBG_NONE; MF_DBGLEVEL = MF_DBG_NONE;
LED_A_ON();
LED_B_OFF();
LED_C_OFF();
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
if (clearTrace) clear_trace(); if (clearTrace) {
clear_trace();
}
set_tracing(true); set_tracing(true);
if (set14aTimeout){ if (set14aTimeout){
@ -1001,30 +1002,28 @@ void MifareChkKeys(uint16_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)
uint8_t sectorCnt = blockNo; uint8_t sectorCnt = blockNo;
int res = MifareMultisectorChk(datain, keyCount, sectorCnt, keyType, OLD_MF_DBGLEVEL, &keyIndex); int res = MifareMultisectorChk(datain, keyCount, sectorCnt, keyType, OLD_MF_DBGLEVEL, &keyIndex);
LED_B_ON();
if (res >= 0) { if (res >= 0) {
cmd_send(CMD_ACK, 1, 0, 0, keyIndex, 80); cmd_send(CMD_ACK, 1, 0, 0, keyIndex, 80);
} else { } else {
cmd_send(CMD_ACK, 0, 0, 0, NULL, 0); cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);
} }
LED_B_OFF();
} else { } else {
int res = MifareChkBlockKeys(datain, keyCount, blockNo, keyType, OLD_MF_DBGLEVEL); int res = MifareChkBlockKeys(datain, keyCount, blockNo, keyType, OLD_MF_DBGLEVEL);
LED_B_ON();
if (res > 0) { if (res > 0) {
cmd_send(CMD_ACK, 1, 0, 0, datain + (res - 1) * 6, 6); cmd_send(CMD_ACK, 1, 0, 0, datain + (res - 1) * 6, 6);
} else { } else {
cmd_send(CMD_ACK, 0, 0, 0, NULL, 0); cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);
} }
LED_B_OFF();
} }
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LEDsoff(); LED_D_OFF();
// restore debug level // restore debug level
MF_DBGLEVEL = OLD_MF_DBGLEVEL; MF_DBGLEVEL = OLD_MF_DBGLEVEL;
LED_A_OFF();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

70
client/cmdhfmf.c
View file

@ -1099,16 +1099,17 @@ int CmdHF14AMfChk(const char *Cmd)
if (param_getchar(Cmd, 0)=='*') { if (param_getchar(Cmd, 0)=='*') {
SectorsCnt = ParamCardSizeSectors(param_getchar(Cmd + 1, 0)); SectorsCnt = ParamCardSizeSectors(param_getchar(Cmd + 1, 0));
} } else {
else {
blockNo = param_get8(Cmd, 0); blockNo = param_get8(Cmd, 0);
// Singe Key check, so Set Sector count to cover sectors (1 to sector that contains the block) // Singe Key check, so Set Sector count to cover sectors (1 to sector that contains the block)
// 1 and 2 Cards : Sector = blockNo/4 + 1 // 1 and 2 Cards : Sector = blockNo/4 + 1
// Sectors 0 - 31 : 4 blocks per sector : Blocks 0 - 127 // Sectors 0 - 31 : 4 blocks per sector : Blocks 0 - 127
// Sectors 32 - 39 : 16 blocks per sector : Blocks 128 - 255 (4K) // Sectors 32 - 39 : 16 blocks per sector : Blocks 128 - 255 (4K)
if (blockNo < 128) SectorsCnt = (blockNo / 4) + 1; if (blockNo < 128) {
else SectorsCnt = 32 + ((blockNo-128)/16) + 1; SectorsCnt = (blockNo / 4) + 1;
} else {
SectorsCnt = 32 + ((blockNo-128)/16) + 1;
}
singleBlock = true; // Set flag for single key check singleBlock = true; // Set flag for single key check
} }
@ -1143,7 +1144,7 @@ int CmdHF14AMfChk(const char *Cmd)
param3InUse = transferToEml | createDumpFile | (btimeout14a != MF_CHKKEYS_DEFTIMEOUT); param3InUse = transferToEml | createDumpFile | (btimeout14a != MF_CHKKEYS_DEFTIMEOUT);
PrintAndLog("--chk keys. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us", PrintAndLog("--chk keys. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",
SectorsCnt, blockNo, keyType?'B':'A', transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106); SectorsCnt, blockNo, keyType==0?'A':keyType==1?'B':'?', transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);
for (i = param3InUse; param_getchar(Cmd, 2 + i); i++) { for (i = param3InUse; param_getchar(Cmd, 2 + i); i++) {
if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) { if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) {
@ -1168,8 +1169,8 @@ int CmdHF14AMfChk(const char *Cmd)
return 2; return 2;
} }
if ( (f = fopen( filename , "r")) ) { if ((f = fopen( filename , "r"))) {
while( fgets(buf, sizeof(buf), f) ){ while (fgets(buf, sizeof(buf), f)) {
if (strlen(buf) < 12 || buf[11] == '\n') if (strlen(buf) < 12 || buf[11] == '\n')
continue; continue;
@ -1177,14 +1178,20 @@ int CmdHF14AMfChk(const char *Cmd)
if( buf[0]=='#' ) continue; //The line start with # is comment, skip if( buf[0]=='#' ) continue; //The line start with # is comment, skip
if (!isxdigit((unsigned char)buf[0])){ bool content_error = false;
PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf); for (int i = 0; i < 12; i++) {
if (!isxdigit((unsigned char)buf[i])) {
content_error = true;
}
}
if (content_error) {
PrintAndLog("File content error. '%s' must include 12 HEX symbols", buf);
continue; continue;
} }
buf[12] = 0; buf[12] = 0;
if ( stKeyBlock - keycnt < 2) { if (stKeyBlock - keycnt < 2) {
p = realloc(keyBlock, 6*(stKeyBlock+=10)); p = realloc(keyBlock, 6*(stKeyBlock+=10));
if (!p) { if (!p) {
PrintAndLog("Cannot allocate memory for defKeys"); PrintAndLog("Cannot allocate memory for defKeys");
@ -1232,8 +1239,9 @@ int CmdHF14AMfChk(const char *Cmd)
} }
printf("\n"); printf("\n");
bool foundAKey = false; bool foundAKey = false;
uint32_t max_keys = keycnt > USB_CMD_DATA_SIZE / 6 ? USB_CMD_DATA_SIZE / 6 : keycnt; bool clearTraceLog = true;
uint32_t max_keys = keycnt > USB_CMD_DATA_SIZE / 6 ? USB_CMD_DATA_SIZE / 6 : keycnt;
// !SingleKey, so all key check (if SectorsCnt > 0) // !SingleKey, so all key check (if SectorsCnt > 0)
if (!singleBlock) { if (!singleBlock) {
@ -1242,7 +1250,8 @@ int CmdHF14AMfChk(const char *Cmd)
for (uint32_t c = 0; c < keycnt; c += max_keys) { for (uint32_t c = 0; c < keycnt; c += max_keys) {
uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c; uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
res = mfCheckKeysSec(SectorsCnt, keyType, btimeout14a, true, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106 res = mfCheckKeysSec(SectorsCnt, keyType, btimeout14a, clearTraceLog, size, &keyBlock[6 * c], e_sector); // timeout is (ms * 106)/10 or us*0.0106
clearTraceLog = false;
if (res != 1) { if (res != 1) {
if (!res) { if (!res) {
@ -1259,10 +1268,11 @@ int CmdHF14AMfChk(const char *Cmd)
} else { } else {
int keyAB = keyType; int keyAB = keyType;
do { do {
for (uint32_t c = 0; c < keycnt; c+=max_keys) { for (uint32_t c = 0; c < keycnt; c += max_keys) {
uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c; uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
res = mfCheckKeys(blockNo, keyAB & 0x01, true, size, &keyBlock[6 * c], &key64); res = mfCheckKeys(blockNo, keyAB & 0x01, true, size, &keyBlock[6 * c], &key64);
clearTraceLog = false;
if (res != 1) { if (res != 1) {
if (!res) { if (!res) {
@ -1285,20 +1295,25 @@ int CmdHF14AMfChk(const char *Cmd)
// print result // print result
if (foundAKey) { if (foundAKey) {
if (SectorsCnt) { PrintAndLog("");
PrintAndLog(""); PrintAndLog("|---|----------------|----------------|");
PrintAndLog("|---|----------------|---|----------------|---|"); PrintAndLog("|sec|key A |key B |");
PrintAndLog("|sec|key A |res|key B |res|"); PrintAndLog("|---|----------------|----------------|");
PrintAndLog("|---|----------------|---|----------------|---|"); for (i = 0; i < SectorsCnt; i++) {
for (i = 0; i < SectorsCnt; i++) { // If a block key check, only print a line if a key was found.
// If a block key check, only print a line if a key was found. if (!singleBlock || e_sector[i].foundKey[0] || e_sector[i].foundKey[1]) {
if (!singleBlock || (e_sector[i].foundKey[0]) || (e_sector[i].foundKey[1]) ){ char keyAString[13] = " ? ";
PrintAndLog("|%03d| %012" PRIx64 " | %d | %012" PRIx64 " | %d |", i, char keyBString[13] = " ? ";
e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]); if (e_sector[i].foundKey[0]) {
} sprintf(keyAString, "%012" PRIx64, e_sector[i].Key[0]);
}
if (e_sector[i].foundKey[1]) {
sprintf(keyBString, "%012" PRIx64, e_sector[i].Key[1]);
}
PrintAndLog("|%03d| %s | %s |", i, keyAString, keyBString);
} }
PrintAndLog("|---|----------------|---|----------------|---|");
} }
PrintAndLog("|---|----------------|----------------|");
} else { } else {
PrintAndLog(""); PrintAndLog("");
PrintAndLog("No valid keys found."); PrintAndLog("No valid keys found.");
@ -1347,6 +1362,7 @@ int CmdHF14AMfChk(const char *Cmd)
return 0; return 0;
} }
void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack) { void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack) {
#define ATTACK_KEY_COUNT 7 // keep same as define in iso14443a.c -> Mifare1ksim() #define ATTACK_KEY_COUNT 7 // keep same as define in iso14443a.c -> Mifare1ksim()
// cannot be more than 7 or it will overrun c.d.asBytes(512) // cannot be more than 7 or it will overrun c.d.asBytes(512)