ADD: "HF 14A READ", got ULTRALIGHT C / EV1 annotation

diff --git a/client/cmdhf.c b/client/cmdhf.c
index b4d3e531248724bebb31b99a245ecf1a766111f6..65cc1c18fe95cc50a448d7ab237a060e5f156c87 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -73,11 +73,30 @@ void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
        case MIFARE_CMD_DEC:                    snprintf(exp,size,"DEC(%d)",cmd[1]); break;
        case MIFARE_CMD_RESTORE:                snprintf(exp,size,"RESTORE(%d)",cmd[1]); break;
        case MIFARE_CMD_TRANSFER:               snprintf(exp,size,"TRANSFER(%d)",cmd[1]); break;
-       case MIFARE_AUTH_KEYA:                  snprintf(exp,size,"AUTH-A(%d)",cmd[1]); break;
+       case MIFARE_AUTH_KEYA:{
+               if ( cmdsize > 3)
+                       snprintf(exp,size,"AUTH-A(%d)",cmd[1]); 
+               else
+                       //      case MIFARE_ULEV1_VERS :  both 0x60.
+                       snprintf(exp,size,"EV1 VERSION");
+               break;
+       }
        case MIFARE_AUTH_KEYB:                  snprintf(exp,size,"AUTH-B(%d)",cmd[1]); break;
        case MIFARE_MAGICWUPC1:                 snprintf(exp,size,"MAGIC WUPC1"); break;
        case MIFARE_MAGICWUPC2:                 snprintf(exp,size,"MAGIC WUPC2"); break;
        case MIFARE_MAGICWIPEC:                 snprintf(exp,size,"MAGIC WIPEC"); break;
+       case MIFARE_ULC_AUTH_1 :                snprintf(exp,size,"AUTH "); break;
+       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_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;
+       
        default:                                                snprintf(exp,size,"?"); break;
        }
        return;

diff --git a/common/protocols.h b/common/protocols.h
index 3cdf79f92a87b9616ba991491db8ad303cf03bb2..c3591804bc0658ef939b1b53ba72cdc12964599c 100644 (file)
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -123,9 +123,19 @@ NXP/Philips CUSTOM COMMANDS
 #define MIFARE_CMD_RESTORE      0xC2
 #define MIFARE_CMD_TRANSFER     0xB0
 
-#define MIFARE_ULC_WRITE        0xA0
+//#define MIFARE_ULC_WRITE        0xA0
 #define MIFARE_ULC_AUTH_1       0x1A
-#define MIFARE_ULC_AUTH_2        0xAF
+#define MIFARE_ULC_AUTH_2       0xAF
+#define MIFARE_ULEV1_AUTH              0x1B
+#define MIFARE_ULEV1_VERS              0x60
+#define MIFARE_ULEV1_FASTREAD  0x3A
+#define MIFARE_ULEV1_WRITE             0xA2
+//#define MIFARE_ULEV1_COMP_WRITE      0xA0
+#define MIFARE_ULEV1_READ_CNT  0x39
+#define MIFARE_ULEV1_INCR_CNT  0xA5
+#define MIFARE_ULEV1_READSIG   0x3C
+#define MIFARE_ULEV1_CHECKTEAR 0x3E
+#define MIFARE_ULEV1_VCSL              0x4B
 
 /**
 06 00 = INITIATE