Merge branch 'master' of https://github.com/iceman1001/proxmark3

[proxmark3-svn] / common / crc.c

diff --git a/common/crc.c b/common/crc.c
index 451282bf5d7196fd8b01f612c03b3612235edfc3..0425a4fd7b53b94c9cd0533dc2fd5c3b53866737 100644 (file)
--- a/common/crc.c
+++ b/common/crc.c
@@ -94,24 +94,13 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size) {
        return reflect(crc_finish(&crc), 8);
 }
 
-// credits to marshmellow
-// width=8  poly=0xA3, reversed poly=0x8B,  init=0xB0  refin=true  refout=true  xorout=0x00  check=0x28  name="CRC-8/JA"
-uint32_t CRC8ja(uint8_t *buff, size_t size) {
-       crc_t crc;
-       crc_init_ref(&crc, 8, 0xA3, 0x42, 0x00, TRUE, TRUE);
-       for ( int i=0; i < size; ++i)
-               crc_update(&crc, buff[i], 8);
-       return crc_finish(&crc);
-       //return reflect(crc_finish(&crc), 8);
-}
-
 // This CRC-16 is used in Legic Advant systems. 
 // width=8  poly=0xB400, reversed poly=0x  init=depends  refin=true  refout=true  xorout=0x0000  check=  name="CRC-16/LEGIC"
 uint32_t CRC16Legic(uint8_t *buff, size_t size, uint8_t uidcrc) {
 
        #define CRC16_POLY_LEGIC 0xB400
-       //uint8_t initial = reflect(uidcrc, 8);
-       uint16_t initial = uidcrc;
+       uint16_t initial = reflect(uidcrc, 8);
+       //uint16_t initial = uidcrc;
        initial |= initial << 8;
        crc_t crc;
        crc_init_ref(&crc, 16, CRC16_POLY_LEGIC, initial, 0, TRUE, TRUE);