git.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c

index 83060b0149c79ee1fd33dc6d9cf09903b6d1ea03..ed08917a57cccd06519a54a9e4f131ff31935227 100644 (file)

--- a/client/cmdhfmf.c

+++ b/client/cmdhfmf.c

@@ -25,6 +25,7 @@

#include "mifarehost.h"\r

#include "mifare.h"\r

#include "mfkey.h"\r

+#include "hardnested/hardnested_bf_core.h"\r

\r

#define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up\r

\r

@@ -527,7 +528,6 @@ int CmdHF14AMfRestore(const char *Cmd)

//----------------------------------------------\r

// Nested\r

//----------------------------------------------\r

-# define NESTED_KEY_COUNT 15\r

\r

static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, bool *paramD, uint8_t *timeout) {\r

char ctmp3[3] = {0};\r

@@ -563,7 +563,7 @@ int CmdHF14AMfNested(const char *Cmd)

uint8_t trgKeyType = 0;\r

uint8_t SectorsCnt = 0;\r

uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r

- uint8_t keyBlock[NESTED_KEY_COUNT * 6];\r

+ uint8_t keyBlock[MifareDefaultKeysSize * 6];\r

uint64_t key64 = 0;\r

// timeout in units. (ms * 106)/10 or us*0.0106\r

uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default\r

@@ -713,7 +713,7 @@ int CmdHF14AMfNested(const char *Cmd)

}\r

\r

PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r

- mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, NESTED_KEY_COUNT, keyBlock, e_sector);\r

+ mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, MifareDefaultKeysSize, keyBlock, e_sector);\r

\r

// get known key from array\r

bool keyFound = false;\r

@@ -863,6 +863,13 @@ int CmdHF14AMfNestedHard(const char *Cmd)

PrintAndLog(" w: Acquire nonces and write them to binary file nonces.bin");\r

PrintAndLog(" s: Slower acquisition (required by some non standard cards)");\r

PrintAndLog(" r: Read nonces.bin and start attack");\r

+ PrintAndLog(" iX: set type of SIMD instructions. Without this flag programs autodetect it.");\r

+ PrintAndLog(" i5: AVX512");\r

+ PrintAndLog(" i2: AVX2");\r

+ PrintAndLog(" ia: AVX");\r

+ PrintAndLog(" is: SSE2");\r

+ PrintAndLog(" im: MMX");\r

+ PrintAndLog(" in: none (use CPU regular instruction set)");\r

PrintAndLog(" ");\r

PrintAndLog(" sample1: hf mf hardnested 0 A FFFFFFFFFFFF 4 A");\r

PrintAndLog(" sample2: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");\r

@@ -881,15 +888,20 @@ int CmdHF14AMfNestedHard(const char *Cmd)

int tests = 0;\r

\r

+ uint16_t iindx = 0;\r

if (ctmp == 'R' || ctmp == 'r') {\r

nonce_file_read = true;\r

+ iindx = 1;\r

if (!param_gethex(Cmd, 1, trgkey, 12)) {\r

know_target_key = true;\r

+ iindx = 2;\r

}\r

} else if (ctmp == 'T' || ctmp == 't') {\r

tests = param_get32ex(Cmd, 1, 100, 10);\r

+ iindx = 2;\r

if (!param_gethex(Cmd, 2, trgkey, 12)) {\r

know_target_key = true;\r

+ iindx = 3;\r

}\r

} else {\r

blockNo = param_get8(Cmd, 0);\r

@@ -923,19 +935,54 @@ int CmdHF14AMfNestedHard(const char *Cmd)

know_target_key = true;\r

i++;\r

}\r

+ iindx = i;\r

\r

while ((ctmp = param_getchar(Cmd, i))) {\r

if (ctmp == 's' || ctmp == 'S') {\r

slow = true;\r

} else if (ctmp == 'w' || ctmp == 'W') {\r

nonce_file_write = true;\r

+ } else if (param_getlength(Cmd, i) == 2 && ctmp == 'i') {\r

+ iindx = i;\r

} else {\r

- PrintAndLog("Possible options are w and/or s");\r

+ PrintAndLog("Possible options are w , s and/or iX");\r

return 1;\r

}\r

i++;\r

}\r

+ \r

+ SetSIMDInstr(SIMD_AUTO);\r

+ if (iindx > 0) {\r

+ while ((ctmp = param_getchar(Cmd, iindx))) {\r

+ if (param_getlength(Cmd, iindx) == 2 && ctmp == 'i') {\r

+ switch(param_getchar_indx(Cmd, 1, iindx)) {\r

+ case '5':\r

+ SetSIMDInstr(SIMD_AVX512);\r

+ break;\r

+ case '2':\r

+ SetSIMDInstr(SIMD_AVX2);\r

+ break;\r

+ case 'a':\r

+ SetSIMDInstr(SIMD_AVX);\r

+ break;\r

+ case 's':\r

+ SetSIMDInstr(SIMD_SSE2);\r

+ break;\r

+ case 'm':\r

+ SetSIMDInstr(SIMD_MMX);\r

+ break;\r

+ case 'n':\r

+ SetSIMDInstr(SIMD_NONE);\r

+ break;\r

+ default:\r

+ PrintAndLog("Unknown SIMD type. %c", param_getchar_indx(Cmd, 1, iindx));\r

+ return 1;\r

+ }\r

+ iindx++;\r

+ } \r

+ }\r

\r

PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ",\r

trgBlockNo,\r

@@ -1986,8 +2033,8 @@ int CmdHF14AMfCWipe(const char *Cmd)

bool fillCard = false;\r

\r

if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r

- PrintAndLog("Usage: hf mf cwipe [card size] [w] [p]");\r

- PrintAndLog("sample: hf mf cwipe 1 w s");\r

+ PrintAndLog("Usage: hf mf cwipe [card size] [w] [f]");\r

+ PrintAndLog("sample: hf mf cwipe 1 w f");\r

PrintAndLog("[card size]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r

PrintAndLog("w - Wipe magic Chinese card (only works with gen:1a cards)");\r

PrintAndLog("f - Fill the card with default data and keys (works with gen:1a and gen:1b cards only)");\r