X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/11b1e2e506dec11aba29116e2fb926b497b6d87b..f07e76c687291ad31eff9e76b2ebb72a326d01c1:/client/cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 65cc1c18..6cd65fd6 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -77,7 +77,7 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 		if ( cmdsize > 3)
 			snprintf(exp,size,"AUTH-A(%d)",cmd[1]); 
 		else
-			//	case MIFARE_ULEV1_VERS :  both 0x60.
+			//	case MIFARE_ULEV1_VERSION :  both 0x60.
 			snprintf(exp,size,"EV1 VERSION");
 		break;
 	}
@@ -89,10 +89,26 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 	case MIFARE_ULC_AUTH_2 : 		snprintf(exp,size,"AUTH_ANSW"); break;
 	case MIFARE_ULEV1_AUTH :		snprintf(exp,size,"PWD-AUTH"); break;
 
-	case MIFARE_ULEV1_FASTREAD :	snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]); break;
-	case MIFARE_ULEV1_WRITE :		snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); break;
-	case MIFARE_ULEV1_READ_CNT :	snprintf(exp,size,"READ CNT(%d)",cmd[1]); break;
-	case MIFARE_ULEV1_INCR_CNT :	snprintf(exp,size,"INC(%d)",cmd[1]); break;
+	case MIFARE_ULEV1_FASTREAD : {
+		if ( cmd[2] < 0x21)
+			snprintf(exp,size,"READ RANGE (%d-%d)",cmd[1],cmd[2]); 
+		break;
+	}
+	case MIFARE_ULEV1_WRITE : {
+		if ( cmd[1] < 0x21 )
+			snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); 
+		break;
+	}
+	case MIFARE_ULEV1_READ_CNT :{
+		if ( cmd[1] < 5 )
+			snprintf(exp,size,"READ CNT(%d)",cmd[1]);
+		break;
+	}
+	case MIFARE_ULEV1_INCR_CNT : {
+		if ( cmd[1] < 5 )
+		snprintf(exp,size,"INC(%d)",cmd[1]);
+		break;
+	}
 	case MIFARE_ULEV1_READSIG :		snprintf(exp,size,"READ_SIG"); break;
 	case MIFARE_ULEV1_CHECKTEAR : 	snprintf(exp,size,"CHK_TEARING(%d)",cmd[1]); break;
 	case MIFARE_ULEV1_VCSL :		snprintf(exp,size,"VCSL"); break;