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

Commented out unused, set but never read variables (cause build to fail if warnings treated as errors)

Browse source
This commit is contained in:
GooglePlus@YoungJules.net 2012-06-12 12:21:26 +00:00
commit 9f69393035
3 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
armsrc/appmain.c
View file

@ -186,7 +186,7 @@ int AvgAdc(int ch) // was static - merlok
void MeasureAntennaTuning(void) void MeasureAntennaTuning(void)
{ {
uint8_t *dest = (uint8_t *)BigBuf; uint8_t *dest = (uint8_t *)BigBuf;
int i, ptr = 0, adcval = 0, peak = 0, peakv = 0, peakf = 0;; int i, adcval = 0, peak = 0, peakv = 0, peakf = 0; //ptr = 0
int vLf125 = 0, vLf134 = 0, vHf = 0; // in mV int vLf125 = 0, vLf134 = 0, vHf = 0; // in mV
UsbCommand c; UsbCommand c;
@ -217,7 +217,7 @@ void MeasureAntennaTuning(void)
peakv = adcval; peakv = adcval;
peak = dest[i]; peak = dest[i];
peakf = i; peakf = i;
ptr = i; //ptr = i;
} }
} }

18
armsrc/iclass.c
View file

@ -125,7 +125,7 @@ static struct {
static RAMFUNC int MillerDecoding(int bit) static RAMFUNC int MillerDecoding(int bit)
{ {
int error = 0; //int error = 0;
int bitright; int bitright;
if(!Uart.bitBuffer) { if(!Uart.bitBuffer) {
@ -193,7 +193,7 @@ static RAMFUNC int MillerDecoding(int bit)
// When not part of SOF or EOF, it is an error // When not part of SOF or EOF, it is an error
Uart.state = STATE_UNSYNCD; Uart.state = STATE_UNSYNCD;
Uart.highCnt = 0; Uart.highCnt = 0;
error = 4; //error = 4;
} }
} }
} }
@ -205,10 +205,10 @@ static RAMFUNC int MillerDecoding(int bit)
if(!bit) { if(!bit) {
if(Uart.dropPosition) { if(Uart.dropPosition) {
if(Uart.state == STATE_START_OF_COMMUNICATION) { if(Uart.state == STATE_START_OF_COMMUNICATION) {
error = 1; //error = 1;
} }
else { else {
error = 7; //error = 7;
} }
// It is an error if we already have seen a drop in current frame // It is an error if we already have seen a drop in current frame
Uart.state = STATE_UNSYNCD; Uart.state = STATE_UNSYNCD;
@ -248,7 +248,7 @@ static RAMFUNC int MillerDecoding(int bit)
if(!Uart.dropPosition) { if(!Uart.dropPosition) {
Uart.state = STATE_UNSYNCD; Uart.state = STATE_UNSYNCD;
Uart.highCnt = 0; Uart.highCnt = 0;
error = 9; //error = 9;
} }
else { else {
Uart.shiftReg >>= 2; Uart.shiftReg >>= 2;
@ -282,7 +282,7 @@ static RAMFUNC int MillerDecoding(int bit)
if(!Uart.dropPosition) { if(!Uart.dropPosition) {
Uart.state = STATE_UNSYNCD; Uart.state = STATE_UNSYNCD;
Uart.highCnt = 0; Uart.highCnt = 0;
error = 3; //error = 3;
} }
else { else {
Uart.dropPosition--; Uart.dropPosition--;
@ -358,7 +358,7 @@ static RAMFUNC int MillerDecoding(int bit)
Uart.OutOfCnt = 4; // Start at 1/4, could switch to 1/256 Uart.OutOfCnt = 4; // Start at 1/4, could switch to 1/256
Uart.dropPosition = 0; Uart.dropPosition = 0;
Uart.shiftReg = 0; Uart.shiftReg = 0;
error = 0; //error = 0;
} }
else { else {
Uart.highCnt = 0; Uart.highCnt = 0;
@ -730,7 +730,7 @@ void RAMFUNC SnoopIClass(void)
// We won't start recording the frames that we acquire until we trigger; // We won't start recording the frames that we acquire until we trigger;
// a good trigger condition to get started is probably when we see a // a good trigger condition to get started is probably when we see a
// response from the tag. // response from the tag.
int triggered = FALSE; // FALSE to wait first for card //int triggered = FALSE; // FALSE to wait first for card
// The command (reader -> tag) that we're receiving. // The command (reader -> tag) that we're receiving.
// The length of a received command will in most cases be no more than 18 bytes. // The length of a received command will in most cases be no more than 18 bytes.
@ -885,7 +885,7 @@ void RAMFUNC SnoopIClass(void)
traceLen += Demod.len; traceLen += Demod.len;
if(traceLen > TRACE_LENGTH) break; if(traceLen > TRACE_LENGTH) break;
triggered = TRUE; //triggered = TRUE;
// And ready to receive another response. // And ready to receive another response.
memset(&Demod, 0, sizeof(Demod)); memset(&Demod, 0, sizeof(Demod));

60
armsrc/iso14443a.c
View file

@ -156,7 +156,7 @@ static struct {
static RAMFUNC int MillerDecoding(int bit) static RAMFUNC int MillerDecoding(int bit)
{ {
int error = 0; //int error = 0;
int bitright; int bitright;
if(!Uart.bitBuffer) { if(!Uart.bitBuffer) {
@ -202,7 +202,7 @@ static RAMFUNC int MillerDecoding(int bit)
// measured a drop in first and second half // measured a drop in first and second half
// which should not be possible // which should not be possible
Uart.state = STATE_ERROR_WAIT; Uart.state = STATE_ERROR_WAIT;
error = 0x01; //error = 0x01;
} }
Uart.posCnt = 0; Uart.posCnt = 0;
@ -213,7 +213,7 @@ static RAMFUNC int MillerDecoding(int bit)
if(Uart.drop == DROP_SECOND_HALF) { if(Uart.drop == DROP_SECOND_HALF) {
// error, should not happen in SOC // error, should not happen in SOC
Uart.state = STATE_ERROR_WAIT; Uart.state = STATE_ERROR_WAIT;
error = 0x02; //error = 0x02;
} }
else { else {
// correct SOC // correct SOC
@ -251,7 +251,7 @@ static RAMFUNC int MillerDecoding(int bit)
// Would be STATE_MILLER_Z // Would be STATE_MILLER_Z
// but Z does not follow X, so error // but Z does not follow X, so error
Uart.state = STATE_ERROR_WAIT; Uart.state = STATE_ERROR_WAIT;
error = 0x03; //error = 0x03;
} }
if(Uart.drop == DROP_SECOND_HALF) { if(Uart.drop == DROP_SECOND_HALF) {
// We see a '1' and stay in state X // We see a '1' and stay in state X
@ -372,7 +372,7 @@ static RAMFUNC int MillerDecoding(int bit)
Uart.bitCnt = 0; Uart.bitCnt = 0;
Uart.byteCnt = 0; Uart.byteCnt = 0;
Uart.parityBits = 0; Uart.parityBits = 0;
error = 0; //error = 0;
} }
else { else {
Uart.highCnt = 0; Uart.highCnt = 0;
@ -422,7 +422,7 @@ static RAMFUNC int ManchesterDecoding(int v)
{ {
int bit; int bit;
int modulation; int modulation;
int error = 0; //int error = 0;
if(!Demod.buff) { if(!Demod.buff) {
Demod.buff = 1; Demod.buff = 1;
@ -479,7 +479,7 @@ static RAMFUNC int ManchesterDecoding(int v)
case 0x01: Demod.samples = 0; break; case 0x01: Demod.samples = 0; break;
} }
} }
error = 0; //error = 0;
} }
} }
else { else {
@ -503,7 +503,7 @@ static RAMFUNC int ManchesterDecoding(int v)
if(Demod.state!=DEMOD_ERROR_WAIT) { if(Demod.state!=DEMOD_ERROR_WAIT) {
Demod.state = DEMOD_ERROR_WAIT; Demod.state = DEMOD_ERROR_WAIT;
Demod.output[Demod.len] = 0xaa; Demod.output[Demod.len] = 0xaa;
error = 0x01; //error = 0x01;
} }
} }
else if(modulation) { else if(modulation) {
@ -518,7 +518,7 @@ static RAMFUNC int ManchesterDecoding(int v)
else { else {
Demod.output[Demod.len] = 0xab; Demod.output[Demod.len] = 0xab;
Demod.state = DEMOD_ERROR_WAIT; Demod.state = DEMOD_ERROR_WAIT;
error = 0x02; //error = 0x02;
} }
break; break;
@ -556,7 +556,7 @@ static RAMFUNC int ManchesterDecoding(int v)
else { else {
Demod.output[Demod.len] = 0xad; Demod.output[Demod.len] = 0xad;
Demod.state = DEMOD_ERROR_WAIT; Demod.state = DEMOD_ERROR_WAIT;
error = 0x03; //error = 0x03;
} }
break; break;
@ -1045,9 +1045,9 @@ ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
uint8_t *receivedCmd = (uint8_t *)BigBuf; uint8_t *receivedCmd = (uint8_t *)BigBuf;
int len; int len;
int i; //int i;
int u; //int u;
uint8_t b; //uint8_t b;
// To control where we are in the protocol // To control where we are in the protocol
int order = 0; int order = 0;
@ -1059,7 +1059,7 @@ ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
int cmdsRecvd = 0; int cmdsRecvd = 0;
int fdt_indicator; //int fdt_indicator;
memset(receivedCmd, 0x44, 400); memset(receivedCmd, 0x44, 400);
@ -1110,7 +1110,7 @@ ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
// doob - added loads of debug strings so we can see what the reader is saying to us during the sim as hi14alist is not populated // doob - added loads of debug strings so we can see what the reader is saying to us during the sim as hi14alist is not populated
// Okay, look at the command now. // Okay, look at the command now.
lastorder = order; lastorder = order;
i = 1; // first byte transmitted //i = 1; // first byte transmitted
if(receivedCmd[0] == 0x26) { if(receivedCmd[0] == 0x26) {
// Received a REQUEST // Received a REQUEST
resp = resp1; respLen = resp1Len; order = 1; resp = resp1; respLen = resp1Len; order = 1;
@ -1191,7 +1191,7 @@ ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
// Look at last parity bit to determine timing of answer // Look at last parity bit to determine timing of answer
if((Uart.parityBits & 0x01) || receivedCmd[0] == 0x52) { if((Uart.parityBits & 0x01) || receivedCmd[0] == 0x52) {
// 1236, so correction bit needed // 1236, so correction bit needed
i = 0; //i = 0;
} }
memset(receivedCmd, 0x44, 32); memset(receivedCmd, 0x44, 32);
@ -1206,9 +1206,9 @@ ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]);
if(respLen <= 0) continue; if(respLen <= 0) continue;
//---------------------------- //----------------------------
u = 0; //u = 0;
b = 0x00; //b = 0x00;
fdt_indicator = FALSE; //fdt_indicator = FALSE;
EmSendCmd14443aRaw(resp, respLen, receivedCmd[0] == 0x52); EmSendCmd14443aRaw(resp, respLen, receivedCmd[0] == 0x52);
/* // Modulate Manchester /* // Modulate Manchester
@ -1870,7 +1870,7 @@ void ReaderMifare(uint32_t parameter)
byte_t nt_diff = 0; byte_t nt_diff = 0;
LED_A_OFF(); LED_A_OFF();
byte_t par = 0; byte_t par = 0;
byte_t par_mask = 0xff; //byte_t par_mask = 0xff;
byte_t par_low = 0; byte_t par_low = 0;
int led_on = TRUE; int led_on = TRUE;
uint8_t uid[8]; uint8_t uid[8];
@ -1921,7 +1921,7 @@ void ReaderMifare(uint32_t parameter)
{ {
LED_A_ON(); LED_A_ON();
memcpy(nt_attacked, nt, 4); memcpy(nt_attacked, nt, 4);
par_mask = 0xf8; //par_mask = 0xf8;
par_low = par & 0x07; par_low = par & 0x07;
} }
@ -1981,7 +1981,7 @@ void Mifare1ksim(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
int cardSTATE = MFEMUL_NOFIELD; int cardSTATE = MFEMUL_NOFIELD;
int _7BUID = 0; int _7BUID = 0;
int vHf = 0; // in mV int vHf = 0; // in mV
int nextCycleTimeout = 0; //int nextCycleTimeout = 0;
int res; int res;
// uint32_t timer = 0; // uint32_t timer = 0;
uint32_t selTimer = 0; uint32_t selTimer = 0;
@ -1991,10 +1991,10 @@ void Mifare1ksim(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
uint8_t cardWRBL = 0; uint8_t cardWRBL = 0;
uint8_t cardAUTHSC = 0; uint8_t cardAUTHSC = 0;
uint8_t cardAUTHKEY = 0xff; // no authentication uint8_t cardAUTHKEY = 0xff; // no authentication
uint32_t cardRn = 0; //uint32_t cardRn = 0;
uint32_t cardRr = 0; uint32_t cardRr = 0;
uint32_t cuid = 0; uint32_t cuid = 0;
uint32_t rn_enc = 0; //uint32_t rn_enc = 0;
uint32_t ans = 0; uint32_t ans = 0;
uint32_t cardINTREG = 0; uint32_t cardINTREG = 0;
uint8_t cardINTBLOCK = 0; uint8_t cardINTBLOCK = 0;
@ -2086,7 +2086,7 @@ void Mifare1ksim(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
if(res) break; if(res) break;
} }
nextCycleTimeout = 0; //nextCycleTimeout = 0;
// if (len) Dbprintf("len:%d cmd: %02x %02x %02x %02x", len, receivedCmd[0], receivedCmd[1], receivedCmd[2], receivedCmd[3]); // if (len) Dbprintf("len:%d cmd: %02x %02x %02x %02x", len, receivedCmd[0], receivedCmd[1], receivedCmd[2], receivedCmd[3]);
@ -2172,8 +2172,8 @@ void Mifare1ksim(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)
case MFEMUL_AUTH1:{ case MFEMUL_AUTH1:{
if (len == 8) { if (len == 8) {
// --- crypto // --- crypto
rn_enc = bytes_to_num(receivedCmd, 4); //rn_enc = bytes_to_num(receivedCmd, 4);
cardRn = rn_enc ^ crypto1_word(pcs, rn_enc , 1); //cardRn = rn_enc ^ crypto1_word(pcs, rn_enc , 1);
cardRr = bytes_to_num(&receivedCmd[4], 4) ^ crypto1_word(pcs, 0, 0); cardRr = bytes_to_num(&receivedCmd[4], 4) ^ crypto1_word(pcs, 0, 0);
// test if auth OK // test if auth OK
if (cardRr != prng_successor(nonce, 64)){ if (cardRr != prng_successor(nonce, 64)){
@ -2220,7 +2220,7 @@ lbWORK: if (len == 0) break;
// LogTrace(NULL, 0, GetDeltaCountUS(), 0, true); // LogTrace(NULL, 0, GetDeltaCountUS(), 0, true);
cardSTATE = MFEMUL_AUTH1; cardSTATE = MFEMUL_AUTH1;
nextCycleTimeout = 10; //nextCycleTimeout = 10;
break; break;
} }
} else { } else {
@ -2242,7 +2242,7 @@ lbWORK: if (len == 0) break;
// --- crypto // --- crypto
cardSTATE = MFEMUL_AUTH1; cardSTATE = MFEMUL_AUTH1;
nextCycleTimeout = 10; //nextCycleTimeout = 10;
break; break;
} }
} }
@ -2280,7 +2280,7 @@ lbWORK: if (len == 0) break;
break; break;
} }
EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK)); EmSend4bit(mf_crypto1_encrypt4bit(pcs, CARD_ACK));
nextCycleTimeout = 50; //nextCycleTimeout = 50;
cardSTATE = MFEMUL_WRITEBL2; cardSTATE = MFEMUL_WRITEBL2;
cardWRBL = receivedCmd[1]; cardWRBL = receivedCmd[1];
break; break;