- fix: trace of hf mf mifare had always been cleared by mfCheckKeys() in nonce2key()

- fix: parity was not checked for reader commands in hf list 14a
- add: enable tracing for hf mf nested
This commit is contained in:
pwpiwi 2015-07-02 08:49:34 +02:00
commit 5330f5329f
8 changed files with 27 additions and 37 deletions

View file

@ -378,7 +378,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
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 {