X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3e134b4c20a5528b8264cd87d3fdebd0b2df6fd9..111c6934d4e5c58883d08210399afe8eaeccc5c3:/common/crc.c

diff --git a/common/crc.c b/common/crc.c
index 451282bf..72e6f024 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -82,7 +82,6 @@ uint32_t CRC8Maxim(uint8_t *buff, size_t size) {
 	return crc_finish(&crc);
 }
 
-
 // width=4  poly=0xC, reversed poly=0x7  init=0x5   refin=true  refout=true  xorout=0x0000  check=  name="CRC-4/LEGIC"
 // width=8  poly=0x63, reversed poly=0x8D  init=0x55  refin=true  refout=true  xorout=0x0000  check=0xC6  name="CRC-8/LEGIC"
 // the CRC needs to be reversed before returned.
@@ -94,24 +93,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);
@@ -137,4 +125,21 @@ uint32_t CRC16_CCITT(uint8_t *buff, size_t size) {
 	for ( int i=0; i < size; ++i)
 		crc_update(&crc, buff[i], 8);
 	return  crc_finish(&crc);
+}
+//width=16  poly=0x8408  init=0xffff  refin=false  refout=true  xorout=0xffff  check=0xF0B8  name="CRC-16/ISO/IEC 13239"
+uint32_t CRC16_Iso15693(uint8_t *buff, size_t size) {
+	crc_t crc;
+	crc_init_ref(&crc, 16, 0x8408, 0xFFFF, 0xFFFF, true, false);	
+	for ( int i=0; i < size; ++i)
+		crc_update(&crc, buff[i], 8);
+	return reflect(crc_finish(&crc), 16);
+}
+//width=16  poly=0x8408  init=0xffff  refin=true  refout=true  xorout=0x0BC3  check=0xF0B8  name="CRC-16/ICLASS"
+uint32_t CRC16_ICLASS(uint8_t *buff, size_t size) {
+
+	crc_t crc;
+	crc_init_ref(&crc, 16, 0x8408, 0xFFFF, 0x0BC3, false, false);	
+	for ( int i=0; i < size; ++i)
+		crc_update(&crc, buff[i], 8);
+	return  crc_finish(&crc);
 }
\ No newline at end of file