Fixed issue with dumping iclass tags > 2KB in size

[proxmark3-svn] / common / crc16.c

diff --git a/common/crc16.c b/common/crc16.c
index 1497ecf6c9f02265526ee7f48aeecef6fdcd7ff0..973cd103c009b16697b7523b1cbf60b107500f7a 100644 (file)
--- a/common/crc16.c
+++ b/common/crc16.c
@@ -1,11 +1,45 @@
-WORD update_crc16( WORD crc, BYTE c ) {\r
-       WORD i, v, tcrc = 0;\r
-\r
-       v = (crc ^ c) & 0xff;\r
-  for (i = 0; i < 8; i++) {\r
-      tcrc = ( (tcrc ^ v) & 1 ) ? ( tcrc >> 1 ) ^ 0x8408 : tcrc >> 1;\r
-      v >>= 1;\r
-  }\r
-\r
-  return ((crc >> 8) ^ tcrc)&0xffff;\r
-}\r
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// CRC16
+//-----------------------------------------------------------------------------
+
+#include "crc16.h"
+
+
+unsigned short update_crc16( unsigned short crc, unsigned char c )
+{
+  unsigned short i, v, tcrc = 0;
+
+  v = (crc ^ c) & 0xff;
+  for (i = 0; i < 8; i++) {
+      tcrc = ( (tcrc ^ v) & 1 ) ? ( tcrc >> 1 ) ^ 0x8408 : tcrc >> 1;
+      v >>= 1;
+  }
+
+  return ((crc >> 8) ^ tcrc)&0xffff;
+}
+
+uint16_t crc16(uint8_t const *message, int length, uint16_t remainder, uint16_t polynomial) {
+    
+       if (length == 0)
+        return (~remainder);
+                       
+    for (int byte = 0; byte < length; ++byte) {
+        remainder ^= (message[byte] << 8);
+        for (uint8_t bit = 8; bit > 0; --bit) {
+            if (remainder & 0x8000) {
+                remainder = (remainder << 1) ^ polynomial;
+            } else {
+                remainder = (remainder << 1);
+            }
+        }
+    }
+    return remainder;
+}
+
+uint16_t crc16_ccitt(uint8_t const *message, int length) {
+    return crc16(message, length, 0xffff, 0x1021);
+}