From 4caa2ba610367df1d347f44b7bd2b4422ab8500d Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Thu, 14 Mar 2019 16:23:27 +0200 Subject: [PATCH] mad and ndef compiles --- client/Makefile | 2 ++ common/crc.c | 9 +++++++++ common/crc.h | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/client/Makefile b/client/Makefile index 2064f212..2b5e9ae6 100644 --- a/client/Makefile +++ b/client/Makefile @@ -143,6 +143,8 @@ CMDSRCS = $(SRC_SMARTCARD) \ whereami.c\ mifare/mifarehost.c\ mifare/mifare4.c\ + mifare/mad.c \ + mifare/ndef.c \ parity.c\ crc.c \ crc16.c \ diff --git a/common/crc.c b/common/crc.c index 0c73474f..bdbe8661 100644 --- a/common/crc.c +++ b/common/crc.c @@ -54,3 +54,12 @@ uint32_t CRC8Maxim(uint8_t *buff, size_t size) } return crc_finish(&crc); } + +// width=8 poly=0x1d, init=0xc7 (0xe3 - WRONG! but it mentioned in MAD datasheet) refin=false refout=false xorout=0x00 name="CRC-8/MIFARE-MAD" +uint32_t CRC8Mad(uint8_t *buff, size_t size) { + crc_t crc; + crc_init(&crc, 8, 0x1d, 0xc7, 0); + for (int i = 0; i < size; ++i) + crc_update(&crc, buff[i], 8); + return crc_finish(&crc); +} diff --git a/common/crc.h b/common/crc.h index 946be8a1..1fd32d82 100644 --- a/common/crc.h +++ b/common/crc.h @@ -39,6 +39,10 @@ extern uint32_t crc_finish(crc_t *crc); // Calculate CRC-8/Maxim checksum uint32_t CRC8Maxim(uint8_t *buff, size_t size ); + +// Calculate CRC-8 Mifare MAD checksum +uint32_t CRC8Mad(uint8_t *buff, size_t size); + /* Static initialization of a crc structure */ #define CRC_INITIALIZER(_order, _polynom, _initial_value, _final_xor) { \ .state = ((_initial_value) & ((1L<<(_order))-1)), \