remove old iso14443crc.c, fully replaced by crc16.c functions.

armsrc/iso14443a.h

@@ -104,7 +104,7 @@ typedef struct {
 #endif
 
 #ifndef CheckCrc14A
-# define	CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
+# define CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
 #endif
 
 void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);

armsrc/mifarecmd.h

@@ -17,7 +17,6 @@
 #include "apps.h"
 #include "util.h"
 #include "string.h"
-#include "iso14443crc.h"
 #include "iso14443a.h"
 #include "crapto1/crapto1.h"
 #include "mifareutil.h"

armsrc/mifaredesfire.h

@@ -6,7 +6,6 @@
 #include "apps.h"
 #include "string.h"
 #include "BigBuf.h"
-#include "iso14443crc.h"
 #include "iso14443a.h"
 #include "desfire_key.h"
 #include "mifareutil.h"

armsrc/mifaresim.c

@@ -22,7 +22,6 @@
 
 #include "iso14443a.h"
 #include "mifaresim.h"
-#include "iso14443crc.h"
 #include "crapto1/crapto1.h"
 #include "BigBuf.h"
 #include "string.h"

armsrc/mifaresim.h

@@ -15,6 +15,10 @@
 
 #include <stdint.h>
 
+#ifndef CheckCrc14A
+# define CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
+#endif
+
 void Mifare1ksim(uint16_t flags, uint8_t exitAfterNReads, uint8_t arg2, uint8_t *datain);
 
 #define AC_DATA_READ             0

armsrc/mifaresniff.c

@@ -10,6 +10,10 @@
 
 #include "mifaresniff.h"
 
+#ifndef CheckCrc14A
+# define CheckCrc14A(data, len)	check_crc(CRC_14443_A, (data), (len))
+#endif
+
 //static int sniffState = SNF_INIT;
 static uint8_t sniffUIDType = 0;
 static uint8_t sniffUID[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -229,7 +233,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 
             if ( !reader ) break;
             if ( len != 9 ) break;
-            if ( !CheckCrc14443(CRC_14443_A, data, 9)) break;
+            if ( !CheckCrc14A(data, 9)) break;
             if ( data[1] != 0x70 ) break;
 
             Dbprintf("[!] UID | %x", data[0]);
@@ -266,7 +270,7 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
         }
         case SNF_SAK:{
             // SAK from card?
-            if ((!reader) && (len == 3) && (CheckCrc14443(CRC_14443_A, data, 3))) {
+            if ((!reader) && (len == 3) && (CheckCrc14A(data, 3))) {
                 sniffSAK = data[0];
                 // CL2 UID part to be expected
                 if (( sniffSAK == 0x04) && (sniffUIDType == SNF_UID_4)) {

armsrc/mifaresniff.h

@@ -15,7 +15,6 @@
 #include "apps.h"
 #include "util.h"
 #include "string.h"
-#include "iso14443crc.h"
 #include "iso14443a.h"
 #include "crapto1/crapto1.h"
 #include "mifareutil.h"

armsrc/mifareutil.h

@@ -17,7 +17,6 @@
 #include "parity.h"
 #include "util.h"
 #include "string.h"
-#include "iso14443crc.h"
 #include "iso14443a.h"
 #include "crapto1/crapto1.h"
 #include "des.h"