diff --git a/armsrc/iclass.c b/armsrc/iclass.c index 625cf39b..387603be 100644 --- a/armsrc/iclass.c +++ b/armsrc/iclass.c @@ -1100,7 +1100,6 @@ int doIClassSimulation(uint8_t csn[], int breakAfterMacReceived, uint8_t *reader //Signal tracer // Can be used to get a trigger for an oscilloscope.. LED_C_OFF(); - if(!GetIClassCommandFromReader(receivedCmd, &len, 100)) { buttonPressed = true; break; diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c index cf55e606..50869d77 100644 --- a/armsrc/iso14443a.c +++ b/armsrc/iso14443a.c @@ -399,7 +399,7 @@ static RAMFUNC bool MillerDecoding(uint8_t bit, uint32_t non_real_time) if (Uart.len) { return TRUE; // we are finished with decoding the raw data sequence } else { - UartReset(); // Nothing receiver - start over + UartReset(); // Nothing received - try again } } if (Uart.state == STATE_START_OF_COMMUNICATION) { // error - must not follow directly after SOC @@ -473,6 +473,7 @@ void DemodReset() Demod.endTime = 0; } + void DemodInit(uint8_t *data, uint8_t *parity) { Demod.output = data; @@ -762,6 +763,7 @@ static void CodeIso14443aAsTagPar(const uint8_t *cmd, uint16_t len, uint8_t *par // Send startbit ToSend[++ToSendMax] = SEC_D; + LastProxToAirDuration = 8 * ToSendMax - 4; for(uint16_t i = 0; i < len; i++) { @@ -1232,7 +1234,6 @@ void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t* data) // do the tracing for the previous reader request and this tag answer: uint8_t par[MAX_PARITY_SIZE]; GetParity(p_response->response, p_response->response_n, par); - EmLogTrace(Uart.output, Uart.len, Uart.startTime*16 - DELAY_AIR2ARM_AS_TAG, diff --git a/armsrc/lfops.c b/armsrc/lfops.c index edddb1c6..e402424c 100644 --- a/armsrc/lfops.c +++ b/armsrc/lfops.c @@ -717,6 +717,7 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol) hi2 = hi = lo = 0; } WDT_HIT(); + //SpinDelay(50); } DbpString("Stopped"); if (ledcontrol) LED_A_OFF(); diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c index fed12772..910ea74d 100644 --- a/armsrc/mifaresniff.c +++ b/armsrc/mifaresniff.c @@ -11,6 +11,7 @@ #include "mifaresniff.h" #include "apps.h" + static int sniffState = SNF_INIT; static uint8_t sniffUIDType; static uint8_t sniffUID[8]; diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c index 7c856557..e1ac4453 100644 --- a/armsrc/mifareutil.c +++ b/armsrc/mifareutil.c @@ -361,8 +361,8 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl int mifare_ultra_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData) { // variables - uint16_t len; - uint8_t par[3] = {0}; // enough for 18 parity bits + uint16_t len; + uint8_t par[3] = {0}; // enough for 18 parity bits uint8_t d_block[18]; uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf(); uint8_t* receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE; @@ -394,7 +394,7 @@ int mifare_ultra_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData) int mifare_ultra_special_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData) { - uint16_t len; + uint16_t len; uint8_t d_block[8]; uint8_t *receivedAnswer = get_bigbufptr_recvrespbuf(); uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE; @@ -412,7 +412,8 @@ int mifare_ultra_special_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *bloc if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Send Error: %02x %d", receivedAnswer[0],len); return 1; } - return 0; + + return 0; } int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) @@ -432,11 +433,11 @@ int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid) int mifare_ultra_halt(uint32_t uid) { - uint16_t len; + uint16_t len; uint8_t *receivedAnswer = get_bigbufptr_recvrespbuf(); - uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE; + uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE; - len = mifare_sendcmd_short(NULL, true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL); + len = mifare_sendcmd_short(NULL, true, 0x50, 0x00, receivedAnswer, receivedAnswerPar, NULL); if (len != 0) { if (MF_DBGLEVEL >= 1) Dbprintf("halt error. response len: %x", len); return 1; @@ -468,7 +469,7 @@ uint8_t FirstBlockOfSector(uint8_t sectorNo) // work with emulator memory void emlSetMem(uint8_t *data, int blockNum, int blocksCount) { - uint8_t* emCARD = get_bigbufptr_emlcardmem(); + uint8_t* emCARD = get_bigbufptr_emlcardmem(); memcpy(emCARD + blockNum * 16, data, blocksCount * 16); } diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index 121736e9..46a11b56 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -988,6 +988,7 @@ int CmdHF14AMfChk(const char *Cmd) int transferToEml = 0; int createDumpFile = 0; + keyBlock = calloc(stKeyBlock, 6); if (keyBlock == NULL) return 1; diff --git a/client/cmdhw.c b/client/cmdhw.c index 642f63c5..4f65fb8c 100644 --- a/client/cmdhw.c +++ b/client/cmdhw.c @@ -18,6 +18,7 @@ #include "cmddata.h" #include "cmdhw.h" #include "cmdmain.h" +#include "cmddata.h" /* low-level hardware control */ diff --git a/client/cmdmain.c b/client/cmdmain.c index f041b24f..ee39acc0 100644 --- a/client/cmdmain.c +++ b/client/cmdmain.c @@ -131,7 +131,6 @@ int getCommand(UsbCommand* response) */ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) { - UsbCommand resp; if (response == NULL) response = &resp; diff --git a/client/nonce2key/crapto1.c b/client/nonce2key/crapto1.c index 6c0fcafa..fafbd426 100644 --- a/client/nonce2key/crapto1.c +++ b/client/nonce2key/crapto1.c @@ -551,6 +551,8 @@ lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8], return 0; } + } + s = statelist; for(o = odd; *o != -1; ++o) for(e = even; *e != -1; ++e)