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

fix bit flag comparing to prefered style

Browse source
This commit is contained in:
iceman1001 2024-08-25 15:08:04 +02:00
commit 4ddb417107
2 changed files with 68 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

20
armsrc/hitagS.c
View file

@ -1003,8 +1003,8 @@ static void hitagS_receive_frame(uint8_t *rx, size_t sizeofrx, size_t *rxlen, ui
uint32_t errorCount = 0; uint32_t errorCount = 0;
bool bStarted = false; bool bStarted = false;
uint32_t ra_i=0, h2 = 0, h3 = 0, h4 = 0; uint32_t ra_i = 0, h2 = 0, h3 = 0, h4 = 0;
uint8_t edges[160]={0}; uint8_t edges[160] = {0};
// Dbprintf("TC0_CV:%i TC1_CV:%i TC1_RA:%i", AT91C_BASE_TC0->TC_CV, AT91C_BASE_TC1->TC_CV ,AT91C_BASE_TC1->TC_RA); // Dbprintf("TC0_CV:%i TC1_CV:%i TC1_RA:%i", AT91C_BASE_TC0->TC_CV, AT91C_BASE_TC1->TC_CV ,AT91C_BASE_TC1->TC_RA);
@ -1032,7 +1032,7 @@ static void hitagS_receive_frame(uint8_t *rx, size_t sizeofrx, size_t *rxlen, ui
if (ra >= HITAG_T_WAIT_RESP) { if (ra >= HITAG_T_WAIT_RESP) {
bStarted = true; bStarted = true;
// We always receive a 'one' first, which has the falling edge after a half period |-_| // We always receive a 'one' first, which has the falling edge after a half period |-_|
rx[0] = 0x80; rx[0] = 0x80;
(*rxlen)++; (*rxlen)++;
} else { } else {
@ -1458,15 +1458,15 @@ void ReadHitagS(const lf_hitag_data_t *payload, bool ledcontrol) {
if (g_dbglevel >= DBG_EXTENDED) { if (g_dbglevel >= DBG_EXTENDED) {
if (tag.auth && tag.LKP && pageNum == 1) { if (tag.auth && tag.LKP && pageNum == 1) {
Dbprintf("Page[%2d]: %02X %02X %02X %02X", pageNum, pwdh0, Dbprintf("Page[%2d]: %02X %02X %02X %02X", pageNum, pwdh0,
(tag.pages[pageNum][2]) & 0xff, (tag.pages[pageNum][2]) & 0xff,
(tag.pages[pageNum][1]) & 0xff, (tag.pages[pageNum][1]) & 0xff,
tag.pages[pageNum][0] & 0xff); tag.pages[pageNum][0] & 0xff);
} else { } else {
Dbprintf("Page[%2d]: %02X %02X %02X %02X", pageNum, Dbprintf("Page[%2d]: %02X %02X %02X %02X", pageNum,
(tag.pages[pageNum][3]) & 0xff, (tag.pages[pageNum][3]) & 0xff,
(tag.pages[pageNum][2]) & 0xff, (tag.pages[pageNum][2]) & 0xff,
(tag.pages[pageNum][1]) & 0xff, (tag.pages[pageNum][1]) & 0xff,
tag.pages[pageNum][0] & 0xff); tag.pages[pageNum][0] & 0xff);
} }
} }

83
armsrc/iso14443a.c
View file

@ -1547,8 +1547,9 @@ void SimulateIso14443aTag(uint8_t tagType, uint16_t flags, uint8_t *data, uint8_
} else if (receivedCmd[0] == ISO14443A_CMD_REQA && len == 1) { // Received a REQUEST, but in HALTED, skip } else if (receivedCmd[0] == ISO14443A_CMD_REQA && len == 1) { // Received a REQUEST, but in HALTED, skip
odd_reply = !odd_reply; odd_reply = !odd_reply;
if (odd_reply) if (odd_reply) {
p_response = &responses[RESP_INDEX_ATQA]; p_response = &responses[RESP_INDEX_ATQA];
}
} else if (receivedCmd[0] == ISO14443A_CMD_WUPA && len == 1) { // Received a WAKEUP } else if (receivedCmd[0] == ISO14443A_CMD_WUPA && len == 1) { // Received a WAKEUP
p_response = &responses[RESP_INDEX_ATQA]; p_response = &responses[RESP_INDEX_ATQA];
} else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && len == 2) { // Received request for UID (cascade 1) } else if (receivedCmd[1] == 0x20 && receivedCmd[0] == ISO14443A_CMD_ANTICOLL_OR_SELECT && len == 2) { // Received request for UID (cascade 1)
@ -3063,95 +3064,125 @@ void ReaderIso14443a(PacketCommandNG *c) {
uint8_t buf[PM3_CMD_DATA_SIZE_MIX] = {0x00}; uint8_t buf[PM3_CMD_DATA_SIZE_MIX] = {0x00};
if ((param & ISO14A_CONNECT)) { if ((param & ISO14A_CONNECT) == ISO14A_CONNECT) {
iso14_pcb_blocknum = 0; iso14_pcb_blocknum = 0;
clear_trace(); clear_trace();
} }
set_tracing(true); set_tracing(true);
if ((param & ISO14A_REQUEST_TRIGGER)) if ((param & ISO14A_REQUEST_TRIGGER) == ISO14A_REQUEST_TRIGGER) {
iso14a_set_trigger(true); iso14a_set_trigger(true);
}
if ((param & ISO14A_CONNECT)) { if ((param & ISO14A_CONNECT) == ISO14A_CONNECT) {
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
// notify client selecting status. // notify client selecting status.
// if failed selecting, turn off antenna and quite. // if failed selecting, turn off antenna and quite.
if (!(param & ISO14A_NO_SELECT)) { if ((param & ISO14A_NO_SELECT) != ISO14A_NO_SELECT) {
iso14a_card_select_t *card = (iso14a_card_select_t *)buf; iso14a_card_select_t *card = (iso14a_card_select_t *)buf;
arg0 = iso14443a_select_cardEx( arg0 = iso14443a_select_cardEx(
NULL, card, NULL, true, 0, (param & ISO14A_NO_RATS), NULL,
(param & ISO14A_USE_CUSTOM_POLLING) ? (iso14a_polling_parameters_t *)cmd : &WUPA_POLLING_PARAMETERS card,
NULL,
true,
0,
((param & ISO14A_NO_RATS) == ISO14A_NO_RATS),
((param & ISO14A_USE_CUSTOM_POLLING) == ISO14A_USE_CUSTOM_POLLING) ? (iso14a_polling_parameters_t *)cmd : &WUPA_POLLING_PARAMETERS
); );
// TODO: Improve by adding a cmd parser pointer and moving it by struct length to allow combining data with polling params // TODO: Improve by adding a cmd parser pointer and moving it by struct length to allow combining data with polling params
FpgaDisableTracing(); FpgaDisableTracing();
reply_mix(CMD_ACK, arg0, card->uidlen, 0, buf, sizeof(iso14a_card_select_t)); reply_mix(CMD_ACK, arg0, card->uidlen, 0, buf, sizeof(iso14a_card_select_t));
if (arg0 == 0) if (arg0 == 0) {
goto OUT; goto OUT;
}
} }
} }
uint32_t save_iso14a_timeout = 0; uint32_t save_iso14a_timeout = 0;
if ((param & ISO14A_SET_TIMEOUT)) { if ((param & ISO14A_SET_TIMEOUT) == ISO14A_SET_TIMEOUT) {
save_iso14a_timeout = iso14a_get_timeout(); save_iso14a_timeout = iso14a_get_timeout();
iso14a_set_timeout(timeout); iso14a_set_timeout(timeout);
} }
if ((param & ISO14A_APDU)) { if ((param & ISO14A_APDU) == ISO14A_APDU) {
uint8_t res; uint8_t res;
arg0 = iso14_apdu(cmd, len, (param & ISO14A_SEND_CHAINING), buf, &res); arg0 = iso14_apdu(
cmd,
len,
((param & ISO14A_SEND_CHAINING) == ISO14A_SEND_CHAINING),
buf,
&res
);
FpgaDisableTracing(); FpgaDisableTracing();
reply_mix(CMD_ACK, arg0, res, 0, buf, sizeof(buf)); reply_mix(CMD_ACK, arg0, res, 0, buf, sizeof(buf));
} }
if ((param & ISO14A_RAW)) { if ((param & ISO14A_RAW) == ISO14A_RAW) {
if ((param & ISO14A_APPEND_CRC)) { if ((param & ISO14A_APPEND_CRC) == ISO14A_APPEND_CRC) {
// Don't append crc on empty bytearray... // Don't append crc on empty bytearray...
if (len > 0) { if (len > 0) {
if ((param & ISO14A_TOPAZMODE))
if ((param & ISO14A_TOPAZMODE) == ISO14A_TOPAZMODE) {
AddCrc14B(cmd, len); AddCrc14B(cmd, len);
else } else {
AddCrc14A(cmd, len); AddCrc14A(cmd, len);
}
len += 2; len += 2;
if (lenbits) lenbits += 16;
if (lenbits) {
lenbits += 16;
}
} }
} }
if (lenbits > 0) { // want to send a specific number of bits (e.g. short commands) // want to send a specific number of bits (e.g. short commands)
if ((param & ISO14A_TOPAZMODE)) { if (lenbits > 0) {
if ((param & ISO14A_TOPAZMODE) == ISO14A_TOPAZMODE) {
int bits_to_send = lenbits; int bits_to_send = lenbits;
uint16_t i = 0; uint16_t i = 0;
ReaderTransmitBitsPar(&cmd[i++], MIN(bits_to_send, 7), NULL, NULL); // first byte is always short (7bits) and no parity ReaderTransmitBitsPar(&cmd[i++], MIN(bits_to_send, 7), NULL, NULL); // first byte is always short (7bits) and no parity
bits_to_send -= 7; bits_to_send -= 7;
while (bits_to_send > 0) { while (bits_to_send > 0) {
ReaderTransmitBitsPar(&cmd[i++], MIN(bits_to_send, 8), NULL, NULL); // following bytes are 8 bit and no parity ReaderTransmitBitsPar(&cmd[i++], MIN(bits_to_send, 8), NULL, NULL); // following bytes are 8 bit and no parity
bits_to_send -= 8; bits_to_send -= 8;
} }
} else { } else {
GetParity(cmd, lenbits / 8, parity_array); GetParity(cmd, lenbits / 8, parity_array);
ReaderTransmitBitsPar(cmd, lenbits, parity_array, NULL); // bytes are 8 bit with odd parity ReaderTransmitBitsPar(cmd, lenbits, parity_array, NULL); // bytes are 8 bit with odd parity
} }
} else { // want to send complete bytes only } else { // want to send complete bytes only
if ((param & ISO14A_TOPAZMODE)) { if ((param & ISO14A_TOPAZMODE) == ISO14A_TOPAZMODE) {
size_t i = 0; size_t i = 0;
ReaderTransmitBitsPar(&cmd[i++], 7, NULL, NULL); // first byte: 7 bits, no paritiy ReaderTransmitBitsPar(&cmd[i++], 7, NULL, NULL); // first byte: 7 bits, no paritiy
while (i < len) { while (i < len) {
ReaderTransmitBitsPar(&cmd[i++], 8, NULL, NULL); // following bytes: 8 bits, no paritiy ReaderTransmitBitsPar(&cmd[i++], 8, NULL, NULL); // following bytes: 8 bits, no paritiy
} }
} else { } else {
ReaderTransmit(cmd, len, NULL); // 8 bits, odd parity ReaderTransmit(cmd, len, NULL); // 8 bits, odd parity
} }
} }
if ((param & ISO14A_TOPAZMODE)) { if ((param & ISO14A_TOPAZMODE) == ISO14A_TOPAZMODE) {
if (cmd[0] == TOPAZ_WRITE_E8 || cmd[0] == TOPAZ_WRITE_NE8) { if (cmd[0] == TOPAZ_WRITE_E8 || cmd[0] == TOPAZ_WRITE_NE8) {
if (tearoff_hook() == PM3_ETEAROFF) { // tearoff occurred
// tearoff occurred
if (tearoff_hook() == PM3_ETEAROFF) {
FpgaDisableTracing(); FpgaDisableTracing();
reply_mix(CMD_ACK, 0, 0, 0, NULL, 0); reply_mix(CMD_ACK, 0, 0, 0, NULL, 0);
} else { } else {
@ -3159,6 +3190,7 @@ void ReaderIso14443a(PacketCommandNG *c) {
FpgaDisableTracing(); FpgaDisableTracing();
reply_mix(CMD_ACK, arg0, 0, 0, buf, sizeof(buf)); reply_mix(CMD_ACK, arg0, 0, 0, buf, sizeof(buf));
} }
} else { } else {
arg0 = ReaderReceive(buf, parity_array); arg0 = ReaderReceive(buf, parity_array);
FpgaDisableTracing(); FpgaDisableTracing();
@ -3167,7 +3199,8 @@ void ReaderIso14443a(PacketCommandNG *c) {
} else { } else {
if (tearoff_hook() == PM3_ETEAROFF) { // tearoff occurred // tearoff occurred
if (tearoff_hook() == PM3_ETEAROFF) {
FpgaDisableTracing(); FpgaDisableTracing();
reply_mix(CMD_ACK, 0, 0, 0, NULL, 0); reply_mix(CMD_ACK, 0, 0, 0, NULL, 0);
} else { } else {
@ -3178,14 +3211,14 @@ void ReaderIso14443a(PacketCommandNG *c) {
} }
} }
if ((param & ISO14A_REQUEST_TRIGGER)) if ((param & ISO14A_REQUEST_TRIGGER) == ISO14A_REQUEST_TRIGGER)
iso14a_set_trigger(false); iso14a_set_trigger(false);
if ((param & ISO14A_SET_TIMEOUT)) { if ((param & ISO14A_SET_TIMEOUT) == ISO14A_SET_TIMEOUT) {
iso14a_set_timeout(save_iso14a_timeout); iso14a_set_timeout(save_iso14a_timeout);
} }
if ((param & ISO14A_NO_DISCONNECT)) { if ((param & ISO14A_NO_DISCONNECT) == ISO14A_NO_DISCONNECT) {
return; return;
} }