From 68410a4892c9679abc0e2cf3c9c1efb95651fa4f Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 14 Apr 2016 11:34:02 +0200 Subject: [PATCH] Syntaxt suger --- armsrc/crapto1.c | 9 +++++---- armsrc/iclass.c | 3 ++- armsrc/mifarecmd.c | 5 +---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/armsrc/crapto1.c b/armsrc/crapto1.c index fcfd0b4d..e2058651 100644 --- a/armsrc/crapto1.c +++ b/armsrc/crapto1.c @@ -419,10 +419,11 @@ static uint16_t *dist = 0; int nonce_distance(uint32_t from, uint32_t to) { uint16_t x, i; - if(!dist) { + // generate distance lookup table + if (!dist) { dist = malloc(2 << 16); - if(!dist) - return -1; + if (!dist) return -1; + for (x = i = 1; i; ++i) { dist[(x & 0xff) << 8 | x >> 8] = i; x = x >> 1 | (x ^ x >> 2 ^ x >> 3 ^ x >> 5) << 15; @@ -446,7 +447,7 @@ static uint32_t fastfwd[2][8] = { * encrypt the NACK which is observed when varying only the 3 last bits of Nr * only correct iff [NR_3] ^ NR_3 does not depend on Nr_3 */ -uint32_t *lfsr_prefix_ks(uint8_t ks[8], int isodd) +uint32_t* lfsr_prefix_ks(uint8_t ks[8], int isodd) { uint32_t *candidates = malloc(4 << 10); if(!candidates) return 0; diff --git a/armsrc/iclass.c b/armsrc/iclass.c index 134e7a5e..8c3be1f6 100644 --- a/armsrc/iclass.c +++ b/armsrc/iclass.c @@ -1296,7 +1296,8 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) receivedCmd[3], receivedCmd[4], receivedCmd[5], receivedCmd[6], receivedCmd[7], receivedCmd[8]); // Do not respond - modulated_response = resp_sof; modulated_response_size = 0; //order = 0; + modulated_response = resp_sof; + modulated_response_size = 0; //order = 0; trace_data = NULL; trace_data_size = 0; } diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c index 70f3d4b1..93eea212 100644 --- a/armsrc/mifarecmd.c +++ b/armsrc/mifarecmd.c @@ -75,7 +75,6 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain) break; } - // ----------------------------- crypto1 destroy crypto1_destroy(pcs); if (MF_DBGLEVEL >= 2) DbpString("READ BLOCK FINISHED"); @@ -717,10 +716,8 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, memcpy(buf+i+8, &nt_par_enc, 1); i += 9; } - // wait for the card to become ready again - while(GetCountSspClk() < timeout); - + while(GetCountSspClk() < timeout); } LED_C_OFF(); -- 2.39.2