X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/22f4dca88cc008287b1ef01bb4da0d46cbcf76d1..bc7846f4376472abdc9ced23436dfe3b6dd20e7f:/common/crc.c diff --git a/common/crc.c b/common/crc.c index 2f11f5f4..47e21426 100644 --- a/common/crc.c +++ b/common/crc.c @@ -29,23 +29,22 @@ void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, u } void crc_clear(crc_t *crc) { + crc->state = crc->initial_value & crc->mask; if (crc->refin) crc->state = reflect(crc->state, crc->order); } -void crc_update(crc_t *crc, uint32_t indata, int data_width){ - - //reflected - if (crc->refin) indata = reflect(indata, data_width); +void crc_update2(crc_t *crc, uint32_t data, int data_width){ + + if (crc->refin) + 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. + for( uint8_t bit = data_width; bit > 0; --bit) { + if (crc->state & crc->topbit) crc->state = (crc->state << 1) ^ crc->polynom; else @@ -53,9 +52,10 @@ void crc_update(crc_t *crc, uint32_t indata, int data_width){ } } -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); + if (crc->refin) + data = reflect(data, data_width); int i; for(i=0; i