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

text and style for comparing

Browse source
This commit is contained in:
iceman1001 2024-01-15 01:14:58 +01:00
commit 36be4d9556
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
armsrc/iso15693.c
View file

@ -2452,9 +2452,14 @@ void SendRawCommand15693(iso15_raw_cmd_t *packet) {
bool read_respone = ((packet->flags & ISO15_READ_RESPONSE) == ISO15_READ_RESPONSE); bool read_respone = ((packet->flags & ISO15_READ_RESPONSE) == ISO15_READ_RESPONSE);
bool init = ((packet->flags & ISO15_CONNECT) == ISO15_CONNECT); bool init = ((packet->flags & ISO15_CONNECT) == ISO15_CONNECT);
// This isn't part of the RAW FLAGS from the client.
// This is part of ISO15693 protocol definitions where the following commands needs to request option. // This is part of ISO15693 protocol definitions where the following commands needs to request option.
// note:
// it seem like previous we just guessed and never followed the fISO145_REQ_OPTION flag if it was set / not set from client side.
// this is a problem. Since without this the response from the tag is one byte shorter. And a lot of client side functions has been
// hardcoded to assume for the extra byte in the response.
bool request_answer = false; bool request_answer = false;
switch (packet->raw[1]) { switch (packet->raw[1]) {
case ISO15693_SET_PASSWORD: case ISO15693_SET_PASSWORD:
case ISO15693_ENABLE_PRIVACY: case ISO15693_ENABLE_PRIVACY:
@ -2486,8 +2491,8 @@ void SendRawCommand15693(iso15_raw_cmd_t *packet) {
} else { } else {
// looking at the first byte of the RAW bytes to determine Subcarrier, datarate, request option // looking at the first byte of the RAW bytes to determine Subcarrier, datarate, request option
bool fsk = packet->raw[0] & ISO15_REQ_SUBCARRIER_TWO; bool fsk = ((packet->raw[0] & ISO15_REQ_SUBCARRIER_TWO) == ISO15_REQ_SUBCARRIER_TWO);
bool recv_speed = packet->raw[0] & ISO15_REQ_DATARATE_HIGH; bool recv_speed = ((packet->raw[0] & ISO15_REQ_DATARATE_HIGH) == ISO15_REQ_DATARATE_HIGH);
// send a single EOF to get the tag response // send a single EOF to get the tag response
if (request_answer) { if (request_answer) {
@ -2503,8 +2508,6 @@ void SendRawCommand15693(iso15_raw_cmd_t *packet) {
} }
} }
// note: this prevents using hf 15 cmd with s option - which isn't implemented yet anyway
if (keep_field_on == false) { if (keep_field_on == false) {
switch_off(); // disconnect raw switch_off(); // disconnect raw
SpinDelay(20); SpinDelay(20);