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

picopass uses a different CRC algo

Browse source
This commit is contained in:
iceman1001 2024-01-16 15:32:43 +01:00
commit acaaeea450
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
armsrc/iso14443b.c
View file

@ -2643,7 +2643,14 @@ void SendRawCommand14443B(iso14b_raw_cmd_t *p) {
if ((p->flags & ISO14B_RAW) == ISO14B_RAW) { if ((p->flags & ISO14B_RAW) == ISO14B_RAW) {
if (((p->flags & ISO14B_APPEND_CRC) == ISO14B_APPEND_CRC) && (p->rawlen)) { if (((p->flags & ISO14B_APPEND_CRC) == ISO14B_APPEND_CRC) && (p->rawlen)) {
AddCrc14B(p->raw, p->rawlen);
// Picopass uses different CRC algo
// it also excludes the first instruction byte
if ((p->flags & ISO14B_SELECT_PICOPASS) == ISO14B_SELECT_PICOPASS) {
AddCrc15(p->raw + 1, p->rawlen - 1);
} else {
AddCrc14B(p->raw, p->rawlen);
}
p->rawlen += 2; p->rawlen += 2;
} }

4
armsrc/iso14443b.h
View file

@ -34,6 +34,10 @@
# define AddCrc14B(data, len) compute_crc(CRC_14443_B, (data), (len), (data)+(len), (data)+(len)+1) # define AddCrc14B(data, len) compute_crc(CRC_14443_B, (data), (len), (data)+(len), (data)+(len)+1)
#endif #endif
#ifndef AddCrc15
#define AddCrc15(data, len) compute_crc(CRC_ICLASS, (data), (len), (data)+(len), (data)+(len)+1)
#endif
void iso14443b_setup(void); void iso14443b_setup(void);
int iso14443b_apdu(uint8_t const *msg, size_t msg_len, bool send_chaining, void *rxdata, uint16_t rxmaxlen, uint8_t *res, uint16_t *responselen); int iso14443b_apdu(uint8_t const *msg, size_t msg_len, bool send_chaining, void *rxdata, uint16_t rxmaxlen, uint8_t *res, uint16_t *responselen);