From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Tue, 25 Aug 2015 05:53:00 +0000 (+0200)
Subject: Merge branch 'master' into topaz
X-Git-Tag: v2.3.0~20^2~2
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/8e21541e77dd0909a99a1ed1106a6df87d34a247

Merge branch 'master' into topaz
---

8e21541e77dd0909a99a1ed1106a6df87d34a247
diff --cc client/cmdhf.c
index 4777a0f4,f8daff7e..ee0b4fd8
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@@ -484,10 -378,11 +484,10 @@@ uint16_t printTraceLine(uint16_t tracep
  			oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
  		}
  		uint8_t parityBits = parityBytes[j>>3];
- 		if (protocol != ISO_14443B && isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+ 		if (protocol != ISO_14443B && (isResponse || protocol == ISO_14443A) && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
  			snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
 -
  		} else {
 -			snprintf(line[j/16]+(( j % 16) * 4),110, "%02x  ", frame[j]);
 +			snprintf(line[j/16]+(( j % 16) * 4), 110, " %02x ", frame[j]);
  		}
  
  	}