X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/40c6a02bc9b602885f2887c023e17a8559cc733c..refs/pull/243/head:/client/cmdhfmf.c
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index d5ce118b..7a6aaa3b 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -9,89 +9,45 @@
//-----------------------------------------------------------------------------
#include <inttypes.h>
-#include "cmdhfmf.h"
-#include "./nonce2key/nonce2key.h"
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "proxmark3.h"
+#include "cmdmain.h"
+#include "util.h"
+#include "ui.h"
+#include "mifarehost.h"
+#include "mifare.h"
+#include "mfkey.h"
-static int CmdHelp(const char *Cmd);
+#define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up
-int CmdHF14AMifare(const char *Cmd)
-{
- uint32_t uid = 0;
- uint32_t nt = 0, nr = 0;
- uint64_t par_list = 0, ks_list = 0, r_key = 0;
- int16_t isOK = 0;
- UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};
+static int CmdHelp(const char *Cmd);
- // message
- printf("-------------------------------------------------------------------------\n");
- printf("Executing command. Expected execution time: 25sec on average :-)\n");
- printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");
- printf("-------------------------------------------------------------------------\n");
-
- start:
- clearCommandBuffer();
- SendCommand(&c);
-
- //flush queue
- while (ukbhit()) {
- int c = getchar(); (void) c;
- }
-
- // wait cycle
- while (true) {
- printf(".");
- fflush(stdout);
- if (ukbhit()) {
- getchar();
- printf("\naborted via keyboard!\n");
- break;
- }
-
- UsbCommand resp;
- if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
- isOK = resp.arg[0];
- uid = (uint32_t)bytes_to_num(resp.d.asBytes + 0, 4);
- nt = (uint32_t)bytes_to_num(resp.d.asBytes + 4, 4);
- par_list = bytes_to_num(resp.d.asBytes + 8, 8);
- ks_list = bytes_to_num(resp.d.asBytes + 16, 8);
- nr = bytes_to_num(resp.d.asBytes + 24, 4);
- printf("\n\n");
- switch (isOK) {
- case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;
- case -2 : PrintAndLog("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break;
- case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable).\n"); break;
- case -4 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");
- PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;
- default: ;
- }
- break;
- }
- }
+int CmdHF14AMifare(const char *Cmd)
+{
+ int isOK = 0;
+ uint64_t key = 0;
- printf("\n");
-
- // error
- if (isOK != 1) return 1;
-
- // execute original function from util nonce2key
- if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {
- isOK = 2;
- PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt);
- PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");
- c.arg[0] = false;
- goto start;
- } else {
- isOK = 0;
- printf("------------------------------------------------------------------\n");
- PrintAndLog("Found valid key:%012" PRIx64 " \n", r_key);
+ isOK = mfDarkside(&key);
+ switch (isOK) {
+ case -1 : PrintAndLog("Button pressed. Aborted."); return 1;
+ case -2 : PrintAndLog("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests)."); return 1;
+ case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable)."); return 1;
+ case -4 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");
+ PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour."); return 1;
+ case -5 : PrintAndLog("Aborted via keyboard."); return 1;
+ default : PrintAndLog("Found valid key:%012" PRIx64 "\n", key);
}
PrintAndLog("");
return 0;
}
+
int CmdHF14AMfWrBl(const char *Cmd)
{
uint8_t blockNo = 0;
@@ -551,10 +507,17 @@ int CmdHF14AMfRestore(const char *Cmd)
return 0;
}
+
+typedef struct {
+ uint64_t Key[2];
+ int foundKey[2];
+} sector_t;
+
+
int CmdHF14AMfNested(const char *Cmd)
{
int i, j, res, iterations;
- sector *e_sector = NULL;
+ sector_t *e_sector = NULL;
uint8_t blockNo = 0;
uint8_t keyType = 0;
uint8_t trgBlockNo = 0;
@@ -671,10 +634,10 @@ int CmdHF14AMfNested(const char *Cmd)
}
}
else { // ------------------------------------ multiple sectors working
- clock_t time1;
- time1 = clock();
+ uint64_t msclock1;
+ msclock1 = msclock();
- e_sector = calloc(SectorsCnt, sizeof(sector));
+ e_sector = calloc(SectorsCnt, sizeof(sector_t));
if (e_sector == NULL) return 1;
//test current key and additional standard keys first
@@ -742,7 +705,7 @@ int CmdHF14AMfNested(const char *Cmd)
}
}
- printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC);
+ printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)(msclock() - msclock1))/1000.0, ((float)(msclock() - msclock1))/iterations/1000.0);
PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);
//print them
@@ -1071,7 +1034,7 @@ void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack
}
}
}
- } else if (tryMfk32_moebius(ar_resp[i+ATTACK_KEY_COUNT], &key)) {
+ } else if (mfkey32_moebius(ar_resp[i+ATTACK_KEY_COUNT], &key)) {
uint8_t sectorNum = ar_resp[i+ATTACK_KEY_COUNT].sector;
uint8_t keyType = ar_resp[i+ATTACK_KEY_COUNT].keytype;
@@ -1768,7 +1731,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
{
uint8_t memBlock[16] = {0x00};
uint8_t blockNo = 0;
- bool wipeCard = FALSE;
+ bool wipeCard = false;
int res;
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {