Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / common / iso14443crc.c

diff --git a/common/iso14443crc.c b/common/iso14443crc.c
index f91b3ce1c5d9213b1d8cc4a6cee674c26b68a226..851546ae239df0d728ecd73bf0367fae1c82e0fe 100644 (file)
--- a/common/iso14443crc.c
+++ b/common/iso14443crc.c
@@ -1,4 +1,12 @@
-#include "iso14443crc.h"
+//-----------------------------------------------------------------------------
+// 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.
+//-----------------------------------------------------------------------------
+// ISO14443 CRC calculation code.
+//-----------------------------------------------------------------------------
+
+#include "../common/iso14443crc.h"

 
 static unsigned short UpdateCrc14443(unsigned char ch, unsigned short *lpwCrc)
 {
 
 static unsigned short UpdateCrc14443(unsigned char ch, unsigned short *lpwCrc)
 {


@@ -10,7 +18,7 @@ static unsigned short UpdateCrc14443(unsigned char ch, unsigned short *lpwCrc)
 }
 
 void ComputeCrc14443(int CrcType,
 }
 
 void ComputeCrc14443(int CrcType,

-                     unsigned char *Data, int Length,
+                     const unsigned char *Data, int Length,

                      unsigned char *TransmitFirst,
                      unsigned char *TransmitSecond)
 {
                      unsigned char *TransmitFirst,
                      unsigned char *TransmitSecond)
 {


@@ -29,3 +37,12 @@ void ComputeCrc14443(int CrcType,
     *TransmitSecond = (unsigned char) ((wCrc >> 8) & 0xFF);
     return;
 }
     *TransmitSecond = (unsigned char) ((wCrc >> 8) & 0xFF);
     return;
 }

+
+int CheckCrc14443(int CrcType, const unsigned char *Data, int Length) {
+       unsigned char b1;
+       unsigned char b2;
+       if (Length < 3) return 0;
+       ComputeCrc14443(CrcType, Data, Length - 2, &b1, &b2);
+       if ((b1 == Data[Length - 2]) && (b2 == Data[Length - 1])) return 1;
+       return 0;
+}