github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: 'hf mf fchk' - some strange output when only using the default keys (no dictionary file)

Browse source 
fix: 'hf mf fchk' - helptext corrected
fix: 'hf mf fchk' - allow to call with just 1 argument
This commit is contained in:
iceman1001 2017-10-11 13:20:39 +02:00
commit f04723d3f5
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/cmdhfmf.c
View file

@ -129,7 +129,8 @@ int usage_hf14_chk(void){
return 0; return 0;
} }
int usage_hf14_chk_fast(void){ int usage_hf14_chk_fast(void){
PrintAndLog("Usage: hf mf fastchk <card memory> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]"); PrintAndLog("Usage: hf mf fchk <card memory> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");
PrintAndLog("(iceman) This is a improved checkkeys method speedwise ");
PrintAndLog("options:"); PrintAndLog("options:");
PrintAndLog(" h this help"); PrintAndLog(" h this help");
PrintAndLog(" <cardmem> all sectors based on card memory, other values then below defaults to 1k"); PrintAndLog(" <cardmem> all sectors based on card memory, other values then below defaults to 1k");
@ -141,9 +142,9 @@ int usage_hf14_chk_fast(void){
PrintAndLog(" t write keys to emulator memory\n"); PrintAndLog(" t write keys to emulator memory\n");
PrintAndLog(" "); PrintAndLog(" ");
PrintAndLog("samples:"); PrintAndLog("samples:");
PrintAndLog(" hf mf chk 1 1234567890ab keys.dic -- target 1K using key 1234567890ab, using dictionary file"); PrintAndLog(" hf mf fchk 1 1234567890ab keys.dic -- target 1K using key 1234567890ab, using dictionary file");
PrintAndLog(" hf mf chk 1 t -- target 1K, write to emulator mem"); PrintAndLog(" hf mf fchk 1 t -- target 1K, write to emulator mem");
PrintAndLog(" hf mf chk 1 d -- target 1K, write to file"); PrintAndLog(" hf mf fchk 1 d -- target 1K, write to file");
return 0; return 0;
} }
int usage_hf14_keybrute(void){ int usage_hf14_keybrute(void){
@ -1188,7 +1189,7 @@ void shuffle( uint8_t *array, uint16_t len) {
int CmdHF14AMfChk_fast(const char *Cmd) { int CmdHF14AMfChk_fast(const char *Cmd) {
if (strlen(Cmd)<2) return usage_hf14_chk_fast(); if (strlen(Cmd)<1) return usage_hf14_chk_fast();
FILE * f; FILE * f;
char filename[FILE_PATH_SIZE]={0}; char filename[FILE_PATH_SIZE]={0};
@ -1375,7 +1376,7 @@ int CmdHF14AMfChk_fast(const char *Cmd) {
timeout = 0; timeout = 0;
t2 = msclock() - t2; t2 = msclock() - t2;
PrintAndLog("\n[-] Chunk: %.1fs | found %d/%d keys", t2, (float)(t2/1000.0), curr_keys, (SectorsCnt<<1)); PrintAndLog("\n[-] Chunk: %.1fs | found %u/%u keys", t2, (float)(t2/1000.0), curr_keys, (SectorsCnt<<1));
// all keys? // all keys?
if ( curr_keys == SectorsCnt*2 || lastChunk ) { if ( curr_keys == SectorsCnt*2 || lastChunk ) {