X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a39944216dd5d765e16917c1092bacc6061b518f..635d6e9befeddbf93f717a129ced376071e56881:/common/crc.c diff --git a/common/crc.c b/common/crc.c index 540ae668..47e21426 100644 --- a/common/crc.c +++ b/common/crc.c @@ -35,32 +35,24 @@ void crc_clear(crc_t *crc) { crc->state = reflect(crc->state, crc->order); } -void crc_update(crc_t *crc, uint32_t indata, int data_width){ - - uint32_t poly = crc->polynom; - - // if requested, return the initial CRC */ - if (indata == 0) - return crc->initial_value; - - //reflected +void crc_update2(crc_t *crc, uint32_t data, int data_width){ + if (crc->refin) - indata = reflect(indata, data_width); + data = reflect(data, data_width); // Bring the next byte into the remainder. - crc->state ^= indata << (crc->order - data_width); + crc->state ^= data << (crc->order - data_width); for( uint8_t bit = data_width; bit > 0; --bit) { - // Try to divide the current data bit. + if (crc->state & crc->topbit) - crc->state = (crc->state << 1) ^ poly; + crc->state = (crc->state << 1) ^ crc->polynom; else crc->state = (crc->state << 1); } - return crc ^ model->xorout; } -void crc_update2(crc_t *crc, uint32_t data, int data_width) +void crc_update(crc_t *crc, uint32_t data, int data_width) { if (crc->refin) data = reflect(data, data_width); @@ -123,7 +115,7 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size) { crc_t crc; crc_init_ref(&crc, 8, 0x63, 0x55, 0, TRUE, TRUE); for ( int i = 0; i < size; ++i) - crc_update(&crc, buff[i], 8); + crc_update2(&crc, buff[i], 8); return reflect(crc_finish(&crc), 8); }