X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f2d46122d30004b152f9c581a438b9939707bab9..484b2b741d999b77017299fb8be40ac5df40a371:/common/crc.c?ds=sidebyside diff --git a/common/crc.c b/common/crc.c index 153ff11c..8e9f3996 100644 --- a/common/crc.c +++ b/common/crc.c @@ -6,6 +6,7 @@ // Generic CRC calculation code. //----------------------------------------------------------------------------- #include "crc.h" +#include "util.h" #include #include @@ -21,8 +22,7 @@ void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, u void crc_update(crc_t *crc, uint32_t data, int data_width) { - int i; - for(i=0; istate; crc->state = crc->state >> 1; if( (oldstate^data) & 1 ) { @@ -42,14 +42,28 @@ uint32_t crc_finish(crc_t *crc) return ( crc->state ^ crc->final_xor ) & crc->mask; } -int CRC8Maxim(uint8_t *buff, size_t size ) { - +//credits to iceman +uint32_t CRC8Maxim(uint8_t *buff, size_t size) { crc_t crc; - crc_init(&crc, 8, 0x31, 0x00, 0x00); + crc_init(&crc, 9, 0x8c, 0x00, 0x00); crc_clear(&crc); - for ( int i=0; i < size; ++i){ + for (size_t i=0; i < size; ++i) crc_update(&crc, buff[i], 8); - } + return crc_finish(&crc); } + +uint32_t CRC8Legic(uint8_t *buff, size_t size) { + + // Poly 0x63, reversed poly 0xC6, Init 0x55, Final 0x00 + crc_t crc; + crc_init(&crc, 8, 0xC6, 0x55, 0); + crc_clear(&crc); + + for ( int i = 0; i < size; ++i) + crc_update(&crc, buff[i], 8); + return SwapBits(crc_finish(&crc), 8); +} + +