github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

CHG: timeing in chk keys,

Browse source
This commit is contained in:
iceman1001 2016-04-23 12:26:29 +02:00
commit 9ea10847ea
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
client/cmdhfmf.c
View file

@ -218,8 +218,7 @@ END:
return 0; return 0;
} }
int CmdHF14AMfWrBl(const char *Cmd) int CmdHF14AMfWrBl(const char *Cmd) {
{
uint8_t blockNo = 0; uint8_t blockNo = 0;
uint8_t keyType = 0; uint8_t keyType = 0;
uint8_t key[6] = {0, 0, 0, 0, 0, 0}; uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@ -268,8 +267,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
return 0; return 0;
} }
int CmdHF14AMfRdBl(const char *Cmd) int CmdHF14AMfRdBl(const char *Cmd) {
{
uint8_t blockNo = 0; uint8_t blockNo = 0;
uint8_t keyType = 0; uint8_t keyType = 0;
uint8_t key[6] = {0, 0, 0, 0, 0, 0}; uint8_t key[6] = {0, 0, 0, 0, 0, 0};
@ -317,8 +315,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
return 0; return 0;
} }
int CmdHF14AMfRdSc(const char *Cmd) int CmdHF14AMfRdSc(const char *Cmd) {
{
int i; int i;
uint8_t sectorNo = 0; uint8_t sectorNo = 0;
uint8_t keyType = 0; uint8_t keyType = 0;
@ -375,8 +372,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
return 0; return 0;
} }
uint8_t FirstBlockOfSector(uint8_t sectorNo) uint8_t FirstBlockOfSector(uint8_t sectorNo) {
{
if (sectorNo < 32) { if (sectorNo < 32) {
return sectorNo * 4; return sectorNo * 4;
} else { } else {
@ -384,8 +380,7 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo)
} }
} }
uint8_t NumBlocksPerSector(uint8_t sectorNo) uint8_t NumBlocksPerSector(uint8_t sectorNo) {
{
if (sectorNo < 32) { if (sectorNo < 32) {
return 4; return 4;
} else { } else {
@ -1204,6 +1199,8 @@ int CmdHF14AMfChk(const char *Cmd) {
// time // time
clock_t t1 = clock(); clock_t t1 = clock();
time_t start, end;
time(&start);
// check keys. // check keys.
for (trgKeyType = !keyType; trgKeyType < 2; (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) { for (trgKeyType = !keyType; trgKeyType < 2; (keyType==2) ? (++trgKeyType) : (trgKeyType=2) ) {
@ -1231,12 +1228,14 @@ int CmdHF14AMfChk(const char *Cmd) {
} }
} }
t1 = clock() - t1; t1 = clock() - t1;
time(&end);
unsigned long elapsed_time = difftime(end, start);
if ( t1 > 0 ) if ( t1 > 0 )
printf("\nTime in checkkeys: %.0f ticks\n", (float)t1); printf("\nTime in checkkeys: %.0f ticks %u seconds\n", (float)t1, elapsed_time);
// 20160116 If Sector A is found, but not Sector B, try just reading it of the tag? // 20160116 If Sector A is found, but not Sector B, try just reading it of the tag?
if ( keyType != 1 ) { if ( keyType != 1 ) {
PrintAndLog("testing to read key B..."); PrintAndLog("testing to read key B...");
for (i = 0; i < SectorsCnt; i++) { for (i = 0; i < SectorsCnt; i++) {
// KEY A but not KEY B // KEY A but not KEY B