printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r
printf("-------------------------------------------------------------------------\n");\r
\r
- clock_t t = clock();\r
+ clock_t t1 = clock();\r
\r
start:\r
clearCommandBuffer();\r
printf("------------------------------------------------------------------\n");\r
PrintAndLog("Found valid key: %012"llx" \n", r_key);\r
}\r
- t = clock() - t;\r
- //printf("Time in darkside: %d ticks - %1.2f seconds\n", t, ((float)t)/CLOCKS_PER_SEC);\r
- printf("Time in darkside: %Lf ticks - %1.2Lf seconds\n", (long double)t, ((long double)t)/CLOCKS_PER_SEC);\r
+ t1 = clock() - t1;\r
+ if ( t1 > 0 ){\r
+ PrintAndLog("Time in darkside: %f ticks - %1.2f sec\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC);\r
+ }\r
return 0;\r
}\r
\r
}\r
\r
// Read keys A from file\r
+ size_t bytes_read;\r
for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
- if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {\r
+ bytes_read = fread( keyA[sectorNo], 1, 6, fin );\r
+ if ( bytes_read == 0) {\r
PrintAndLog("File reading error.");\r
fclose(fin);\r
return 2;\r
\r
// Read keys B from file\r
for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
- if (fread( keyB[sectorNo], 1, 6, fin ) == 0) {\r
+ bytes_read = fread( keyB[sectorNo], 1, 6, fin );\r
+ if ( bytes_read == 0) {\r
PrintAndLog("File reading error.");\r
fclose(fin);\r
return 2;\r
return 1;\r
}\r
\r
+ size_t bytes_read;\r
for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
- if (fread(keyA[sectorNo], 1, 6, fkeys) == 0) {\r
+ bytes_read = fread( keyA[sectorNo], 1, 6, fkeys );\r
+ if ( bytes_read == 0) {\r
PrintAndLog("File reading error (dumpkeys.bin).");\r
fclose(fkeys);\r
return 2;\r
}\r
\r
for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
- if (fread(keyB[sectorNo], 1, 6, fkeys) == 0) {\r
+ bytes_read = fread( keyB[sectorNo], 1, 6, fkeys );\r
+ if ( bytes_read == 0) {\r
PrintAndLog("File reading error (dumpkeys.bin).");\r
fclose(fkeys);\r
return 2;\r
for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r
UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};\r
- memcpy(c.d.asBytes, key, 6);\r
- \r
- if (fread(bldata, 1, 16, fdump) == 0) {\r
+ memcpy(c.d.asBytes, key, 6); \r
+ bytes_read = fread(bldata, 1, 16, fdump);\r
+ if ( bytes_read == 0) {\r
PrintAndLog("File reading error (dumpdata.bin).");\r
fclose(fdump);\r
return 2;\r
}\r
}\r
else { // ------------------------------------ multiple sectors working\r
- clock_t time1 = clock();\r
+ clock_t t1 = clock();\r
\r
e_sector = calloc(SectorsCnt, sizeof(sector));\r
if (e_sector == NULL) return 1;\r
}\r
}\r
\r
- PrintAndLog("Time in nested: %1.2f (%1.2f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC);\r
+ t1 = clock() - t1;\r
+ if ( t1 > 0 ) {\r
+ PrintAndLog("Time in nested: %f ticks %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/iterations/CLOCKS_PER_SEC);\r
+ }\r
\r
PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);\r
//print them\r
}\r
}\r
// time\r
- clock_t time1 = clock();\r
+ clock_t t1 = clock();\r
\r
for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {\r
int b=blockNo;\r
b<127?(b+=4):(b+=16); \r
}\r
}\r
- printf("Time in checkkeys: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/keycnt/CLOCKS_PER_SEC);\r
- \r
+ t1 = clock() - t1;\r
+ if ( t1 > 0 ){\r
+ printf("Time in checkkeys: %f ticks %1.2f sec (%1.2f sec per key)\n\n", (float)t1, ((float)t1)/CLOCKS_PER_SEC, ((float)t1)/keycnt/CLOCKS_PER_SEC);\r
+ }\r
\r
if (transferToEml) {\r
uint8_t block[16];\r
}\r
pnr +=2;\r
}\r
+ \r
if (param_getchar(Cmd, pnr) == 'n') {\r
exitAfterNReads = param_get8(Cmd,pnr+1);\r
pnr += 2;\r
}\r
+ \r
if (param_getchar(Cmd, pnr) == 'i' ) {\r
//Using a flag to signal interactiveness, least significant bit\r
flags |= FLAG_INTERACTIVE;\r
//Using a flag to signal interactiveness, least significant bit\r
flags |= FLAG_NR_AR_ATTACK;\r
}\r
+ \r
PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) ",\r
flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):\r
flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): "N/A"\r
- , exitAfterNReads, flags,flags);\r
+ , exitAfterNReads\r
+ , flags\r
+ , flags);\r
\r
\r
UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r
\r
UsbCommand resp; \r
PrintAndLog("Press pm3-button or send another cmd to abort simulation");\r
- //while(! WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r
- //We're waiting only 1.5 s at a time, otherwise we get the\r
- // annoying message about "Waiting for a response... "\r
- //}\r
- while(!ukbhit() ){\r
- if (!WaitForResponseTimeout(CMD_ACK,&resp,1500) ) continue;\r
+\r
+ while( !ukbhit() ){\r
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue;\r
\r
if ( !(flags & FLAG_NR_AR_ATTACK) ) break;\r
+ \r
if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break;\r
\r
- memset(data, 0x00, sizeof(data));\r
- memset(key, 0x00, sizeof(key));\r
- int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];\r
- \r
- memcpy(data, resp.d.asBytes, len);\r
- \r
- uint64_t corr_uid = 0;\r
- if ( memcmp(data, "\x00\x00\x00\x00", 4) == 0 ) {\r
- corr_uid = ((uint64_t)(data[3] << 24)) | (data[2] << 16) | (data[1] << 8) | data[0];\r
- tryMfk32(corr_uid, data, key);\r
- } else {\r
- corr_uid |= (uint64_t)data[2] << 48; \r
- corr_uid |= (uint64_t)data[1] << 40; \r
- corr_uid |= (uint64_t)data[0] << 32;\r
- corr_uid |= (uint64_t)data[7] << 24;\r
- corr_uid |= (uint64_t)data[6] << 16;\r
- corr_uid |= (uint64_t)data[5] << 8;\r
- corr_uid |= (uint64_t)data[4];\r
- tryMfk64(corr_uid, data, key);\r
- }\r
- PrintAndLog("--");\r
+ memset(data, 0x00, sizeof(data));\r
+ memset(key, 0x00, sizeof(key));\r
+ int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1];\r
+ \r
+ memcpy(data, resp.d.asBytes, len);\r
+ \r
+ uint64_t corr_uid = 0;\r
+ \r
+ // this IF? what was I thinking of?\r
+ if ( memcmp(data, "\x00\x00\x00\x00", 4) == 0 ) {\r
+ corr_uid = ((uint64_t)(data[3] << 24)) | (data[2] << 16) | (data[1] << 8) | data[0];\r
+ tryMfk32(corr_uid, data, key);\r
+ } else {\r
+ corr_uid |= (uint64_t)data[2] << 48; \r
+ corr_uid |= (uint64_t)data[1] << 40; \r
+ corr_uid |= (uint64_t)data[0] << 32;\r
+ corr_uid |= (uint64_t)data[7] << 24;\r
+ corr_uid |= (uint64_t)data[6] << 16;\r
+ corr_uid |= (uint64_t)data[5] << 8;\r
+ corr_uid |= (uint64_t)data[4];\r
+ tryMfk64(corr_uid, data, key);\r
}\r
- }\r
- \r
+ PrintAndLog("--");\r
+ }\r
+ }\r
return 0;\r
}\r
\r
projects / proxmark3-svn / blobdiff