From: iceman1001 Date: Thu, 4 Aug 2016 19:54:11 +0000 (+0200) Subject: CHG: moved a defince arraylen into util.h and changed to uppercase. X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/52eeaef568ac6855f701c51a48d71a393cee3df9 CHG: moved a defince arraylen into util.h and changed to uppercase. --- diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index b5a90b38..9f40e754 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -23,6 +23,7 @@ #include "common.h" #include "cmdmain.h" #include "mifare.h" +#include "cmdhfmf.h" #include "cmdhfmfu.h" #include "nonce2key/nonce2key.h" #include "cmdhf.h" @@ -500,15 +501,13 @@ int CmdHF14ACUIDs(const char *Cmd) { // ## simulate iso14443a tag // ## greg - added ability to specify tag UID int CmdHF14ASim(const char *Cmd) { + #define ATTACK_KEY_COUNT 8 bool errors = FALSE; uint8_t flags = 0; uint8_t tagtype = 1; uint8_t cmdp = 0; uint8_t uid[10] = {0,0,0,0,0,0,0,0,0,0}; int uidlen = 0; - uint8_t data[40]; - uint64_t key = 0; - UsbCommand resp; bool useUIDfromEML = TRUE; while(param_getchar(Cmd, cmdp) != 0x00) { @@ -566,27 +565,23 @@ int CmdHF14ASim(const char *Cmd) { clearCommandBuffer(); SendCommand(&c); - while(!ukbhit()){ - if ( WaitForResponseTimeout(CMD_ACK,&resp,1500)) { - if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){ - memset(data, 0x00, sizeof(data)); - int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1]; - memcpy(data, resp.d.asBytes, len); - key = 0; - - if ( flags & FLAG_NR_AR_ATTACK ) { - bool found = tryMfk32(data, &key); - found ^= tryMfk32_moebius(data, &key); - } - } - } + nonces_t data[ATTACK_KEY_COUNT*2]; + UsbCommand resp; + + while( !ukbhit() ){ + if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500) ) continue; + + if ( !(flags & FLAG_NR_AR_ATTACK) ) break; + if ( (resp.arg[0] & 0xffff) != CMD_SIMULATE_MIFARE_CARD ) break; + + memcpy( data, resp.d.asBytes, sizeof(data) ); + readerAttack(data, TRUE); } return 0; } int CmdHF14ASniff(const char *Cmd) { - int param = 0; - + int param = 0; uint8_t ctmp = param_getchar(Cmd, 0) ; if (ctmp == 'h' || ctmp == 'H') return usage_hf_14a_sniff(); @@ -764,8 +759,7 @@ static void waitCmd(uint8_t iSelect) { } } -static command_t CommandTable[] = -{ +static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, {"list", CmdHF14AList, 0, "[Deprecated] List ISO 14443a history"}, {"reader", CmdHF14AReader, 0, "Act like an ISO14443 Type A reader"}, diff --git a/client/cmdhf15.c b/client/cmdhf15.c index caf0799e..e6cd3e1a 100644 --- a/client/cmdhf15.c +++ b/client/cmdhf15.c @@ -37,13 +37,13 @@ #include "iso15693tools.h" #include "cmdmain.h" -#define FrameSOF Iso15693FrameSOF -#define Logic0 Iso15693Logic0 -#define Logic1 Iso15693Logic1 -#define FrameEOF Iso15693FrameEOF +#define FrameSOF Iso15693FrameSOF +#define Logic0 Iso15693Logic0 +#define Logic1 Iso15693Logic1 +#define FrameEOF Iso15693FrameEOF -#define Crc(data,datalen) Iso15693Crc(data,datalen) -#define AddCrc(data,datalen) Iso15693AddCrc(data,datalen) +#define Crc(data,datalen) Iso15693Crc(data,datalen) +#define AddCrc(data,datalen) Iso15693AddCrc(data,datalen) #define sprintUID(target,uid) Iso15693sprintUID(target,uid) // structure and database for uid -> tagtype lookups @@ -293,7 +293,7 @@ int CmdHF15Demod(const char *Cmd) // First, correlate for SOF for (i = 0; i < 100; i++) { int corr = 0; - for (j = 0; j < arraylen(FrameSOF); j += skip) { + for (j = 0; j < ARRAYLEN(FrameSOF); j += skip) { corr += FrameSOF[j] * GraphBuffer[i + (j / skip)]; } if (corr > max) { @@ -301,23 +301,22 @@ int CmdHF15Demod(const char *Cmd) maxPos = i; } } - PrintAndLog("SOF at %d, correlation %d", maxPos, - max / (arraylen(FrameSOF) / skip)); + PrintAndLog("SOF at %d, correlation %d", maxPos, max / (ARRAYLEN(FrameSOF) / skip)); - i = maxPos + arraylen(FrameSOF) / skip; + i = maxPos + ARRAYLEN(FrameSOF) / skip; int k = 0; uint8_t outBuf[20]; memset(outBuf, 0, sizeof(outBuf)); uint8_t mask = 0x01; for (;;) { int corr0 = 0, corr1 = 0, corrEOF = 0; - for (j = 0; j < arraylen(Logic0); j += skip) { + for (j = 0; j < ARRAYLEN(Logic0); j += skip) { corr0 += Logic0[j] * GraphBuffer[i + (j / skip)]; } - for (j = 0; j < arraylen(Logic1); j += skip) { + for (j = 0; j < ARRAYLEN(Logic1); j += skip) { corr1 += Logic1[j] * GraphBuffer[i + (j / skip)]; } - for (j = 0; j < arraylen(FrameEOF); j += skip) { + for (j = 0; j < ARRAYLEN(FrameEOF); j += skip) { corrEOF += FrameEOF[j] * GraphBuffer[i + (j / skip)]; } // Even things out by the length of the target waveform. @@ -328,17 +327,17 @@ int CmdHF15Demod(const char *Cmd) PrintAndLog("EOF at %d", i); break; } else if (corr1 > corr0) { - i += arraylen(Logic1) / skip; + i += ARRAYLEN(Logic1) / skip; outBuf[k] |= mask; } else { - i += arraylen(Logic0) / skip; + i += ARRAYLEN(Logic0) / skip; } mask <<= 1; if (mask == 0) { k++; mask = 0x01; } - if ((i + (int)arraylen(FrameEOF)) >= GraphTraceLen) { + if ((i + (int)ARRAYLEN(FrameEOF)) >= GraphTraceLen) { PrintAndLog("ran off end!"); break; } @@ -435,14 +434,14 @@ int CmdHF15Afi(const char *Cmd) // Reads all memory pages int CmdHF15DumpMem(const char*Cmd) { + + uint8_t uid[8] = {0,0,0,0,0,0,0,0}; + uint8_t *recv = NULL; UsbCommand resp; - uint8_t uid[8]; - uint8_t *recv=NULL; UsbCommand c = {CMD_ISO_15693_COMMAND, {0, 1, 1}}; // len,speed,recv? - uint8_t *req=c.d.asBytes; - int reqlen=0; - int blocknum=0; - char output[80]; + uint8_t *req = c.d.asBytes; + int reqlen = 0, blocknum = 0; + char output[80] = {0}; if (!getUID(uid)) { PrintAndLog("No Tag found."); @@ -468,15 +467,15 @@ int CmdHF15DumpMem(const char*Cmd) { recv = resp.d.asBytes; if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) { if (!(recv[0] & ISO15_RES_ERROR)) { - retry=0; - *output=0; // reset outputstring + retry = 0; + *output = 0; // reset outputstring sprintf(output, "Block %02x ",blocknum); for ( int i=1; i31 && recv[i]<127)?recv[i]:'.'); + for ( int i = 1; i < resp.arg[0]-2; i++) { // data in cleaned ascii + sprintf(output+strlen(output),"%c",(recv[i] > 31 && recv[i] < 127) ? recv[i] : '.'); } PrintAndLog("%s",output); blocknum++; @@ -512,7 +511,7 @@ static command_t CommandTable15[] = {"cmd", CmdHF15Cmd, 0, "Send direct commands to ISO15693 tag"}, {"findafi", CmdHF15Afi, 0, "Brute force AFI of an ISO15693 tag"}, {"dumpmemory", CmdHF15DumpMem, 0, "Read all memory pages of an ISO15693 tag"}, - {NULL, NULL, 0, NULL} + {NULL, NULL, 0, NULL} }; int CmdHF15(const char *Cmd) diff --git a/client/cmdlf.c b/client/cmdlf.c index 7ca24a0a..6bfbec8d 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -981,7 +981,7 @@ int CmdVchDemod(const char *Cmd) for (i = 0; i < (GraphTraceLen-2048); i++) { int sum = 0; int j; - for (j = 0; j < arraylen(SyncPattern); j++) { + for (j = 0; j < ARRAYLEN(SyncPattern); j++) { sum += GraphBuffer[i+j]*SyncPattern[j]; } if (sum > bestCorrel) { diff --git a/client/cmdlfti.c b/client/cmdlfti.c index 29168787..5997b5f6 100644 --- a/client/cmdlfti.c +++ b/client/cmdlfti.c @@ -174,7 +174,7 @@ int CmdTIDemod(const char *Cmd) uint32_t shift3 = 0x7e000000, shift2 = 0, shift1 = 0, shift0 = 0; - for (i = 0; i < arraylen(bits)-1; i++) { + for (i = 0; i < ARRAYLEN(bits)-1; i++) { int high = 0; int low = 0; int j; diff --git a/client/data.h b/client/data.h index 201aba04..d156a0c8 100644 --- a/client/data.h +++ b/client/data.h @@ -10,14 +10,9 @@ #ifndef DATA_H__ #define DATA_H__ - #include - -#define FILE_PATH_SIZE 1000 - +#include "util.h" extern uint8_t* sample_buf; -#define arraylen(x) (sizeof(x)/sizeof((x)[0])) - void GetFromBigBuf(uint8_t *dest, int bytes, int start_index); void GetEMLFromBigBuf(uint8_t *dest, int bytes, int start_index); #endif