FIX: fixed the "lf pcf7931 write" input validation. *untested*

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index d7a52f6b3531bf09839cb60352c07cd7e9896260..4a8715868764ebc42293c25d4503ad153234cc54 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -225,7 +225,10 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
        }
        // R-block (ack)
        else if ( ((cmd[0] & 0xD0) == 0x80) && ( cmdsize > 2) ) {
        }
        // R-block (ack)
        else if ( ((cmd[0] & 0xD0) == 0x80) && ( cmdsize > 2) ) {

-               snprintf(exp, size, "R-block");
+               if ( (cmd[0] & 0x10) == 0 ) 
+                       snprintf(exp, size, "R-block ACK");
+               else
+                       snprintf(exp, size, "R-block NACK");

        }
        // I-block
        else {
        }
        // I-block
        else {


@@ -528,7 +531,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];
                        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]);
 
                } else {