X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9455b51c2a0554ea2bd55a28dee5a5c2a6707fc6..cb0b8f94c903b5aaa0ebeba5b100ccd39d9625d7:/common/iso15693tools.c?ds=sidebyside

diff --git a/common/iso15693tools.c b/common/iso15693tools.c
index 6d8ae5b1..985e4949 100644
--- a/common/iso15693tools.c
+++ b/common/iso15693tools.c
@@ -6,11 +6,7 @@
 // ISO15693 CRC & other commons
 //-----------------------------------------------------------------------------
 
-
-#include "proxmark3.h"
-#include <stdint.h>
-#include <stdlib.h>
-//#include "iso15693tools.h"
+#include "iso15693tools.h"
 
 // The CRC as described in ISO 15693-Part 3-Annex C
 // 	v	buffer with data
@@ -55,13 +51,39 @@ int sprintf(char *str, const char *format, ...);
 //		target    char* buffer, where to put the UID, if NULL a static buffer is returned
 //		uid[]		the UID in transmission order
 //	return: ptr to string
-char* Iso15693sprintUID(char *target,uint8_t *uid) {
-  static char tempbuf[9]="";
-  if (target==NULL) target=tempbuf;
-  sprintf(target,"%02hX%02hX%02hX%02hX%02hX%02hX%02hX%02hX",
-  				uid[7],uid[6],uid[5],uid[4],uid[3],uid[2],uid[1],uid[0]);
-  return target;
+char* Iso15693sprintUID(char *target, uint8_t *uid) {
+	static char tempbuf[2*8+1] = {0};
+	if (target==NULL) target=tempbuf;
+	sprintf(target,"%02X%02X%02X%02X%02X%02X%02X%02X",
+				uid[7],uid[6],uid[5],uid[4],uid[3],uid[2],uid[1],uid[0]);
+	return target;
 }
 
+uint16_t iclass_crc16(char *data_p, unsigned short length)
+{
+      unsigned char i;
+      unsigned int data;
+	  uint16_t crc = 0xffff;
+
+      if (length == 0)
+            return (~crc);
 
+      do
+      {
+            for (i=0, data=(unsigned int)0xff & *data_p++;
+                 i < 8; 
+                 i++, data >>= 1)
+            {
+                  if ((crc & 0x0001) ^ (data & 0x0001))
+                        crc = (crc >> 1) ^ POLY;
+                  else  crc >>= 1;
+            }
+      } while (--length);
+
+      crc = ~crc;
+      data = crc;
+      crc = (crc << 8) | (data >> 8 & 0xff);
+      crc = crc ^ 0xBC3;
+      return (crc);
+}