X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/83a42ef965b5d04ae98cce58103b6201b6155d6c..c98ab35140d6c56af80338060ba7d470bdc15710:/common/crc.c

diff --git a/common/crc.c b/common/crc.c
index 153ff11c..6c2f6994 100644
--- a/common/crc.c
+++ b/common/crc.c
@@ -6,6 +6,7 @@
 // Generic CRC calculation code.
 //-----------------------------------------------------------------------------
 #include "crc.h"
+#include "util.h"
 #include <stdint.h>
 #include <stddef.h>
 
@@ -21,8 +22,7 @@ void crc_init(crc_t *crc, int order, uint32_t polynom, uint32_t initial_value, u
 
 void crc_update(crc_t *crc, uint32_t data, int data_width)
 {
-	int i;
-	for(i=0; i<data_width; i++) {
+	for( int i=0; i < data_width; i++) {
 		int oldstate = crc->state;
 		crc->state = crc->state >> 1;
 		if( (oldstate^data) & 1 ) {
@@ -42,14 +42,29 @@ uint32_t crc_finish(crc_t *crc)
 	return ( crc->state ^ crc->final_xor ) & crc->mask;
 }
 
-int CRC8Maxim(uint8_t *buff, size_t size  ) {
-	
+//credits to iceman
+uint32_t CRC8Maxim(uint8_t *buff, size_t size) {
 	crc_t crc;
-	crc_init(&crc, 8, 0x31, 0x00, 0x00);
+	crc_init(&crc, 9, 0x8c, 0x00, 0x00);
 	crc_clear(&crc);
 
-	for ( int i=0; i < size; ++i){
+	for (size_t i=0; i < size; ++i)
 		crc_update(&crc, buff[i], 8);
-	}
+
 	return crc_finish(&crc);
 }
+
+//credits to iceman
+uint32_t CRC8Legic(uint8_t *buff, size_t size) {
+
+	// Poly 0x63,   reversed poly 0xC6,  Init 0x55,  Final 0x00
+	crc_t crc;
+	crc_init(&crc, 8, 0xC6, 0x55, 0);
+	crc_clear(&crc);
+	
+	for ( int i = 0; i < size; ++i)
+		crc_update(&crc, buff[i], 8);
+	return SwapBits(crc_finish(&crc), 8);
+}
+
+