From: Martin Holst Swende <martin.holst@gmail.com>
Date: Sat, 26 Apr 2014 14:15:16 +0000 (+0200)
Subject: Fixed (?) http://www.proxmark.org/forum/viewtopic.php?id=1967, two bytes are discarde... 
X-Git-Tag: v1.1.0~1^2^2~7
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/fdcd43eb159b98ea8732ea4479ec1f7e38334f57?hp=f83cc12613d18f6a5a3a5e6c01f7b83cae2ee92f

Fixed (?) http://www.proxmark.org/forum/viewtopic.php?id=1967, two bytes are discarded when adding crc and sending raw iso14443a commands
---

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 8e4082ea..cd7c9540 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -192,6 +192,7 @@ void AppendCrc14443a(uint8_t* data, int len)
 // The function LogTrace() is also used by the iClass implementation in iClass.c
 bool RAMFUNC LogTrace(const uint8_t * btBytes, uint8_t iLen, uint32_t timestamp, uint32_t dwParity, bool readerToTag)
 {
+	if (!tracing) return FALSE;
 	// Return when trace is full
 	if (traceLen + sizeof(timestamp) + sizeof(dwParity) + iLen >= TRACE_SIZE) {
 		tracing = FALSE;	// don't trace any more
@@ -1859,8 +1860,10 @@ void ReaderIso14443a(UsbCommand *c)
 		if(param & ISO14A_APPEND_CRC) {
 			AppendCrc14443a(cmd,len);
 			len += 2;
+			lenbits += 16;
 		}
 		if(lenbits>0) {
+
 			ReaderTransmitBitsPar(cmd,lenbits,GetParity(cmd,lenbits/8), NULL);
 		} else {
 			ReaderTransmit(cmd,len, NULL);