diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c index c6c3d64da..8be500d83 100644 --- a/client/cmdlffdx.c +++ b/client/cmdlffdx.c @@ -127,7 +127,7 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t for (uint8_t i=0; i<8; ++i) raw[i] = bytebits_to_byte(bits + 11 + i * 9, 8); - uint16_t crc = crc16_ccitt_kermit(raw, 8); + uint16_t crc = crc16_kermit(raw, 8); num_to_bytebitsLSBF(crc >> 0, 8, bits+83); num_to_bytebitsLSBF(crc >> 8, 8, bits+92); @@ -211,7 +211,7 @@ int CmdFDXBdemodBI(const char *Cmd){ if (g_debugMode) PrintAndLog("Raw ID Hex: %s", sprint_hex(raw,8)); - uint16_t calcCrc = crc16_ccitt_kermit(raw, 8); + uint16_t calcCrc = crc16_kermit(raw, 8); PrintAndLog("Animal ID: %04u-%012" PRIu64, countryCode, NationalCode); PrintAndLog("National Code: %012" PRIu64, NationalCode); PrintAndLog("CountryCode: %04u", countryCode); @@ -279,7 +279,7 @@ int CmdFdxDemod(const char *Cmd) { num_to_bytes(rawid, 8, raw); - uint16_t calcCrc = crc16_ccitt_kermit(raw, 8); + uint16_t calcCrc = crc16_kermit(raw, 8); PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found: Raw : %s", sprint_hex(raw, 8)); PrintAndLog("Animal ID %04u-%012" PRIu64, countryCode, NationalCode); diff --git a/common/crc.c b/common/crc.c index 86153530c..7aa8c2e20 100644 --- a/common/crc.c +++ b/common/crc.c @@ -128,7 +128,7 @@ uint32_t CRC8Legic(uint8_t *buff, size_t size) { } // 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" +// 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 @@ -142,7 +142,7 @@ uint32_t CRC16Legic(uint8_t *buff, size_t size, uint8_t uidcrc) { return reflect16(crc_finish(&crc)); } -//w=16 poly=0x3d65 init=0x0000 refin=true refout=true xorout=0xffff check=0xea82 name="CRC-16/DNP" +// poly=0x3d65 init=0x0000 refin=true refout=true xorout=0xffff check=0xea82 name="CRC-16/DNP" uint32_t CRC16_DNP(uint8_t *buff, size_t size) { crc_t crc; crc_init_ref(&crc, 16, 0x3d65, 0, 0xffff, true, true); @@ -152,7 +152,7 @@ uint32_t CRC16_DNP(uint8_t *buff, size_t size) { return BSWAP_16(crc_finish(&crc)); } -//width=16 poly=0x1021 init=0x1d0f refin=false refout=false xorout=0x0000 check=0xe5cc name="CRC-16/AUG-CCITT" +// poly=0x1021 init=0x1d0f refin=false refout=false xorout=0x0000 check=0xe5cc name="CRC-16/AUG-CCITT" uint32_t CRC16_CCITT(uint8_t *buff, size_t size) { crc_t crc; crc_init(&crc, 16, 0x1021, 0x1d0f, 0); diff --git a/common/crc16.c b/common/crc16.c index f3440c7d7..4f31e94ee 100644 --- a/common/crc16.c +++ b/common/crc16.c @@ -67,9 +67,6 @@ uint16_t crc16_ccitt(uint8_t const *d, size_t n) { return crc16(d, n, 0xffff, CRC16_POLY_CCITT, false, false); } //poly=0x1021 init=0x0000 refin=true refout=true xorout=0x0000 name="KERMIT" -uint16_t crc16_ccitt_kermit(uint8_t const *d, size_t n){ - return crc16_kermit(d, n); -} uint16_t crc16_kermit(uint8_t const *d, size_t n) { return crc16(d, n, 0x0000, CRC16_POLY_CCITT, true, true); } diff --git a/common/crc16.h b/common/crc16.h index 090f8e009..84ca5653c 100644 --- a/common/crc16.h +++ b/common/crc16.h @@ -20,7 +20,6 @@ uint16_t update_crc16(uint16_t crc, uint8_t c); uint16_t crc16(uint8_t const *message, size_t length, uint16_t remainder, uint16_t polynomial, bool refin, bool refout); uint16_t crc16_ccitt(uint8_t const *d, size_t n); -uint16_t crc16_ccitt_kermit(uint8_t const *d, size_t n); uint16_t crc16_kermit(uint8_t const *d, size_t n); uint16_t crc16_xmodem(uint8_t const *d, size_t n); uint16_t crc16_x25(uint8_t const *d, size_t n);