From: iceman1001 Date: Thu, 13 Nov 2014 21:21:39 +0000 (+0100) Subject: FIX: since the "hf mf ecfill" command supports 0,1,2,4 in card sizes, I consequently... X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/85578fcd4e4c1ef9df478722d4fedc42f5c02d31?hp=a0bf7ba787ea7b309d034e1d5412a7d63b1c2fa3 FIX: since the "hf mf ecfill" command supports 0,1,2,4 in card sizes, I consequently changed "hf mf ekeyprn" --- diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index 10c56cdc..1519c201 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -1596,10 +1596,10 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) uint8_t data[16]; uint64_t keyA, keyB; - if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) { + if (param_getchar(Cmd, 0) == 'h') { PrintAndLog("It prints the keys loaded in the emulator memory"); PrintAndLog("Usage: hf mf ekeyprn [card memory]"); - PrintAndLog(" [card memory]: 1 = 1K (default), 4 = 4K"); + PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K"); PrintAndLog(""); PrintAndLog(" sample: hf mf ekeyprn 1"); return 0; @@ -1607,12 +1607,14 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) char cmdp = param_getchar(Cmd, 0); - switch (cmdp) { + switch (ctmp) { + case '0' : numSectors = 5; break; case '1' : case '\0': numSectors = 16; break; + case '2' : numSectors = 32; break; case '4' : numSectors = 40; break; default: numSectors = 16; - } + } PrintAndLog("|---|----------------|----------------|"); PrintAndLog("|sec|key A |key B |");