Fix for swapped parity when using lf_bulk_program.lua (#591)

[proxmark3-svn] / client / cmdhflist.c

diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 7059a223a38bc3fcc150ad5ebe0718f78cba865d..cf69abbaacf3b52ea965300d98783899c4fa3856 100644 (file)
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -83,6 +83,116 @@ uint8_t mifare_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
        }
 }
 
        }
 }
 

+void annotateIclass(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
+{
+       switch(cmd[0])
+       {
+       case ICLASS_CMD_ACTALL:      snprintf(exp,size,"ACTALL"); break;
+       case ICLASS_CMD_READ_OR_IDENTIFY:{
+               if(cmdsize > 1){
+                       snprintf(exp,size,"READ(%d)",cmd[1]);
+               }else{
+                       snprintf(exp,size,"IDENTIFY");
+               }
+               break;
+       }
+       case ICLASS_CMD_SELECT:      snprintf(exp,size,"SELECT"); break;
+       case ICLASS_CMD_PAGESEL:     snprintf(exp,size,"PAGESEL(%d)", cmd[1]); break;
+       case ICLASS_CMD_READCHECK_KC:snprintf(exp,size,"READCHECK[Kc](%d)", cmd[1]); break;
+       case ICLASS_CMD_READCHECK_KD:snprintf(exp,size,"READCHECK[Kd](%d)", cmd[1]); break;
+       case ICLASS_CMD_CHECK:       snprintf(exp,size,"CHECK"); break;
+       case ICLASS_CMD_DETECT:      snprintf(exp,size,"DETECT"); break;
+       case ICLASS_CMD_HALT:        snprintf(exp,size,"HALT"); break;
+       case ICLASS_CMD_UPDATE:      snprintf(exp,size,"UPDATE(%d)",cmd[1]); break;
+       case ICLASS_CMD_ACT:         snprintf(exp,size,"ACT"); break;
+       case ICLASS_CMD_READ4:       snprintf(exp,size,"READ4(%d)",cmd[1]); break;
+       default:                     snprintf(exp,size,"?"); break;
+       }
+       return;
+}
+
+void annotateIso15693(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
+{
+
+       if(cmd[0] == 0x26)
+       {
+               switch(cmd[1]){
+               case ISO15693_INVENTORY           :snprintf(exp, size, "INVENTORY");break;
+               case ISO15693_STAYQUIET           :snprintf(exp, size, "STAY_QUIET");break;
+               default:                     snprintf(exp,size,"?"); break;
+
+               }
+       }else if(cmd[0] == 0x02)
+       {
+               switch(cmd[1])
+               {
+               case ISO15693_READBLOCK            :snprintf(exp, size, "READBLOCK");break;
+               case ISO15693_WRITEBLOCK           :snprintf(exp, size, "WRITEBLOCK");break;
+               case ISO15693_LOCKBLOCK            :snprintf(exp, size, "LOCKBLOCK");break;
+               case ISO15693_READ_MULTI_BLOCK     :snprintf(exp, size, "READ_MULTI_BLOCK");break;
+               case ISO15693_SELECT               :snprintf(exp, size, "SELECT");break;
+               case ISO15693_RESET_TO_READY       :snprintf(exp, size, "RESET_TO_READY");break;
+               case ISO15693_WRITE_AFI            :snprintf(exp, size, "WRITE_AFI");break;
+               case ISO15693_LOCK_AFI             :snprintf(exp, size, "LOCK_AFI");break;
+               case ISO15693_WRITE_DSFID          :snprintf(exp, size, "WRITE_DSFID");break;
+               case ISO15693_LOCK_DSFID           :snprintf(exp, size, "LOCK_DSFID");break;
+               case ISO15693_GET_SYSTEM_INFO      :snprintf(exp, size, "GET_SYSTEM_INFO");break;
+               case ISO15693_READ_MULTI_SECSTATUS :snprintf(exp, size, "READ_MULTI_SECSTATUS");break;
+               default:                            snprintf(exp,size,"?"); break;
+               }
+       }
+}
+
+
+void annotateTopaz(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
+{
+       switch(cmd[0]) {
+               case TOPAZ_REQA                                         :snprintf(exp, size, "REQA");break;
+               case TOPAZ_WUPA                                         :snprintf(exp, size, "WUPA");break;
+               case TOPAZ_RID                                          :snprintf(exp, size, "RID");break;
+               case TOPAZ_RALL                                         :snprintf(exp, size, "RALL");break;
+               case TOPAZ_READ                                         :snprintf(exp, size, "READ");break;
+               case TOPAZ_WRITE_E                                      :snprintf(exp, size, "WRITE-E");break;
+               case TOPAZ_WRITE_NE                                     :snprintf(exp, size, "WRITE-NE");break;
+               case TOPAZ_RSEG                                         :snprintf(exp, size, "RSEG");break;
+               case TOPAZ_READ8                                        :snprintf(exp, size, "READ8");break;
+               case TOPAZ_WRITE_E8                                     :snprintf(exp, size, "WRITE-E8");break;
+               case TOPAZ_WRITE_NE8                            :snprintf(exp, size, "WRITE-NE8");break;
+               default:                            snprintf(exp,size,"?"); break;
+       }
+}
+
+
+/**
+06 00 = INITIATE
+0E xx = SELECT ID (xx = Chip-ID)
+0B = Get UID
+08 yy = Read Block (yy = block number)
+09 yy dd dd dd dd = Write Block (yy = block number; dd dd dd dd = data to be written)
+0C = Reset to Inventory
+0F = Completion
+0A 11 22 33 44 55 66 = Authenticate (11 22 33 44 55 66 = data to authenticate)
+**/
+
+void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
+{
+       switch(cmd[0]){
+       case ISO14443B_REQB   : snprintf(exp,size,"REQB");break;
+       case ISO14443B_ATTRIB : snprintf(exp,size,"ATTRIB");break;
+       case ISO14443B_HALT   : snprintf(exp,size,"HALT");break;
+       case ISO14443B_INITIATE     : snprintf(exp,size,"INITIATE");break;
+       case ISO14443B_SELECT       : snprintf(exp,size,"SELECT(%d)",cmd[1]);break;
+       case ISO14443B_GET_UID      : snprintf(exp,size,"GET UID");break;
+       case ISO14443B_READ_BLK     : snprintf(exp,size,"READ_BLK(%d)", cmd[1]);break;
+       case ISO14443B_WRITE_BLK    : snprintf(exp,size,"WRITE_BLK(%d)",cmd[1]);break;
+       case ISO14443B_RESET        : snprintf(exp,size,"RESET");break;
+       case ISO14443B_COMPLETION   : snprintf(exp,size,"COMPLETION");break;
+       case ISO14443B_AUTHENTICATE : snprintf(exp,size,"AUTHENTICATE");break;
+       default                     : snprintf(exp,size ,"?");break;
+       }
+
+}
+

 void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 {
        switch(cmd[0])
 void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
 {
        switch(cmd[0])


@@ -215,11 +325,12 @@ void annotateMifare(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize, uint8
                        if (cmdsize == 4 && isResponse) {
                                snprintf(exp,size,"AUTH: nt %s", (AuthData.first_auth) ? "" : "(enc)");
                                MifareAuthState = masNrAr;
                        if (cmdsize == 4 && isResponse) {
                                snprintf(exp,size,"AUTH: nt %s", (AuthData.first_auth) ? "" : "(enc)");
                                MifareAuthState = masNrAr;

-                               if (AuthData.first_auth)
+                               if (AuthData.first_auth) {

                                        AuthData.nt = bytes_to_num(cmd, 4);
                                        AuthData.nt = bytes_to_num(cmd, 4);

-                               else
+                               } else {

                                        AuthData.nt_enc = bytes_to_num(cmd, 4);
                                        AuthData.nt_enc_par = parity[0];
                                        AuthData.nt_enc = bytes_to_num(cmd, 4);
                                        AuthData.nt_enc_par = parity[0];

+                               }

                                return;
                        } else {
                                MifareAuthState = masError;
                                return;
                        } else {
                                MifareAuthState = masError;


@@ -266,6 +377,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
        if (MifareAuthState == masAuthComplete) {
                if (traceCrypto1) {
                        crypto1_destroy(traceCrypto1);
        if (MifareAuthState == masAuthComplete) {
                if (traceCrypto1) {
                        crypto1_destroy(traceCrypto1);

+                       traceCrypto1 = NULL;

                }
 
                MifareAuthState = masFirstData;
                }
 
                MifareAuthState = masFirstData;


@@ -279,19 +391,10 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
                if (AuthData.first_auth) {
                        AuthData.ks2 = AuthData.ar_enc ^ prng_successor(AuthData.nt, 64);
                        AuthData.ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96);
                if (AuthData.first_auth) {
                        AuthData.ks2 = AuthData.ar_enc ^ prng_successor(AuthData.nt, 64);
                        AuthData.ks3 = AuthData.at_enc ^ prng_successor(AuthData.nt, 96);

-                       struct Crypto1State *revstate = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
-                       lfsr_rollback_word(revstate, 0, 0);
-                       lfsr_rollback_word(revstate, 0, 0);
-                       lfsr_rollback_word(revstate, AuthData.nr_enc, 1);
-                       lfsr_rollback_word(revstate, AuthData.uid ^ AuthData.nt, 0);
-
-                       uint64_t lfsr = 0;
-                       crypto1_get_lfsr(revstate, &lfsr);
-                       crypto1_destroy(revstate);
-                       mfLastKey = lfsr;
-                       PrintAndLog("            |          * | key | probable key:%x%x Prng:%s   ks2:%08x ks3:%08x |     |", 
-                               (unsigned int)((lfsr & 0xFFFFFFFF00000000) >> 32), 
-                               (unsigned int)(lfsr & 0xFFFFFFFF), 
+
+                       mfLastKey = GetCrypto1ProbableKey(&AuthData);
+                       PrintAndLog("            |          * | key | probable key:%012"PRIx64" Prng:%s   ks2:%08x ks3:%08x |     |", 
+                               mfLastKey,

                                validate_prng_nonce(AuthData.nt) ? "WEAK": "HARD",
                                AuthData.ks2,
                                AuthData.ks3);
                                validate_prng_nonce(AuthData.nt) ? "WEAK": "HARD",
                                AuthData.ks2,
                                AuthData.ks3);


@@ -300,12 +403,16 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
 
                        traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
                } else {
 
                        traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
                } else {

+                       if (traceCrypto1) {
+                               crypto1_destroy(traceCrypto1);
+                               traceCrypto1 = NULL;
+                       }
+

                        // check last used key
                        if (mfLastKey) {
                                if (NestedCheckKey(mfLastKey, &AuthData, cmd, cmdsize, parity)) {
                        // check last used key
                        if (mfLastKey) {
                                if (NestedCheckKey(mfLastKey, &AuthData, cmd, cmdsize, parity)) {

-                                       PrintAndLog("            |          * | key | last used key:%x%x            ks2:%08x ks3:%08x |     |", 
-                                               (unsigned int)((mfLastKey & 0xFFFFFFFF00000000) >> 32), 
-                                               (unsigned int)(mfLastKey & 0xFFFFFFFF),
+                                       PrintAndLog("            |          * | key | last used key:%012"PRIx64"            ks2:%08x ks3:%08x |     |", 
+                                               mfLastKey,

                                                AuthData.ks2,
                                                AuthData.ks3);
 
                                                AuthData.ks2,
                                                AuthData.ks3);
 


@@ -317,12 +424,12 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
                        if (!traceCrypto1) {
                                for (int defaultKeyCounter = 0; defaultKeyCounter < MifareDefaultKeysSize; defaultKeyCounter++){
                                        if (NestedCheckKey(MifareDefaultKeys[defaultKeyCounter], &AuthData, cmd, cmdsize, parity)) {
                        if (!traceCrypto1) {
                                for (int defaultKeyCounter = 0; defaultKeyCounter < MifareDefaultKeysSize; defaultKeyCounter++){
                                        if (NestedCheckKey(MifareDefaultKeys[defaultKeyCounter], &AuthData, cmd, cmdsize, parity)) {

-                                               PrintAndLog("            |          * | key | default key:%x%x              ks2:%08x ks3:%08x |     |", 
-                                                       (unsigned int)((MifareDefaultKeys[defaultKeyCounter] & 0xFFFFFFFF00000000) >> 32), 
-                                                       (unsigned int)(MifareDefaultKeys[defaultKeyCounter] & 0xFFFFFFFF),
+                                               PrintAndLog("            |          * | key | default key:%012"PRIx64"              ks2:%08x ks3:%08x |     |", 
+                                                       MifareDefaultKeys[defaultKeyCounter],

                                                        AuthData.ks2,
                                                        AuthData.ks3);
 
                                                        AuthData.ks2,
                                                        AuthData.ks3);
 

+                                               mfLastKey = MifareDefaultKeys[defaultKeyCounter];

                                                traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
                                                break;
                                        };
                                                traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
                                                break;
                                        };


@@ -331,8 +438,7 @@ bool DecodeMifareData(uint8_t *cmd, uint8_t cmdsize, uint8_t *parity, bool isRes
                        
                        // nested
                        if (!traceCrypto1 && validate_prng_nonce(AuthData.nt)) {
                        
                        // nested
                        if (!traceCrypto1 && validate_prng_nonce(AuthData.nt)) {

-printf("nested. uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt, AuthData.ar_enc, AuthData.at_enc);
-                               uint32_t ntx = prng_successor(AuthData.nt, 90);
+                               uint32_t ntx = prng_successor(AuthData.nt, 90); 

                                for (int i = 0; i < 16383; i++) {
                                        ntx = prng_successor(ntx, 1);
                                        if (NTParityChk(&AuthData, ntx)){
                                for (int i = 0; i < 16383; i++) {
                                        ntx = prng_successor(ntx, 1);
                                        if (NTParityChk(&AuthData, ntx)){


@@ -344,23 +450,54 @@ printf("nested. uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt,
                                                mf_crypto1_decrypt(pcs, mfData, cmdsize, 0);
                                
                                                crypto1_destroy(pcs);
                                                mf_crypto1_decrypt(pcs, mfData, cmdsize, 0);
                                
                                                crypto1_destroy(pcs);

-                                               if (CheckCrc14443(CRC_14443_A, mfData, cmdsize)) {
+                                               if (CheckCrypto1Parity(cmd, cmdsize, mfData, parity) && CheckCrc14443(CRC_14443_A, mfData, cmdsize)) {

                                                        AuthData.ks2 = ks2;
                                                        AuthData.ks3 = ks3;
                                                        AuthData.ks2 = ks2;
                                                        AuthData.ks3 = ks3;

+
+                                                       AuthData.nt = ntx;
+                                                       mfLastKey = GetCrypto1ProbableKey(&AuthData);
+                                                       PrintAndLog("            |          * | key | nested probable key:%012"PRIx64"      ks2:%08x ks3:%08x |     |", 
+                                                               mfLastKey,
+                                                               AuthData.ks2,
+                                                               AuthData.ks3);
+

                                                        traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
                                                        break;
                                                }
                                        }                                               
                                }
                                                        traceCrypto1 = lfsr_recovery64(AuthData.ks2, AuthData.ks3);
                                                        break;
                                                }
                                        }                                               
                                }

-                               if (traceCrypto1)
-                                       printf("key> nt=%08x nonce distance=%d \n", ntx, nonce_distance(AuthData.nt, ntx));
-                               else
-                                       printf("key> don't have any valid nt( \n");                                     

                        }
                        
                        //hardnested
                        if (!traceCrypto1) {
                                printf("hardnested not implemented. uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt, AuthData.ar_enc, AuthData.at_enc);
                        }
                        
                        //hardnested
                        if (!traceCrypto1) {
                                printf("hardnested not implemented. uid:%x nt:%x ar_enc:%x at_enc:%x\n", AuthData.uid, AuthData.nt, AuthData.ar_enc, AuthData.at_enc);

+                               MifareAuthState = masError;
+
+                               /* TOO SLOW( needs to have more strong filter. with this filter - aprox 4 mln tests
+                               uint32_t t = msclock();
+                               uint32_t t1 = t;
+                               int n = 0;
+                               for (uint32_t i = 0; i < 0xFFFFFFFF; i++) {
+                                       if (NTParityChk(&AuthData, i)){
+
+                                               uint32_t ks2 = AuthData.ar_enc ^ prng_successor(i, 64);
+                                               uint32_t ks3 = AuthData.at_enc ^ prng_successor(i, 96);
+                                               struct Crypto1State *pcs = lfsr_recovery64(ks2, ks3);
+
+
+
+
+                                               n++;
+
+                                               if (!(n % 100000)) {
+                                                       printf("delta=%d n=%d ks2=%x ks3=%x \n", msclock() - t1 , n, ks2, ks3);
+                                                       t1 = msclock();
+                                               }
+
+                                       }
+                               }
+                               printf("delta=%d n=%d\n", msclock() - t, n);
+                               */

                        }
                }
                
                        }
                }
                


@@ -437,6 +574,7 @@ bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize,
        if(!CheckCrc14443(CRC_14443_A, buf, cmdsize)) 
                return false;
        
        if(!CheckCrc14443(CRC_14443_A, buf, cmdsize)) 
                return false;
        

+       AuthData.nt = nt1;

        AuthData.ks2 = AuthData.ar_enc ^ ar;
        AuthData.ks3 = AuthData.at_enc ^ at;
 
        AuthData.ks2 = AuthData.ar_enc ^ ar;
        AuthData.ks3 = AuthData.at_enc ^ at;
 


@@ -444,20 +582,24 @@ bool NestedCheckKey(uint64_t key, TAuthData *ad, uint8_t *cmd, uint8_t cmdsize,
 }
 
 bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc) {
 }
 
 bool CheckCrypto1Parity(uint8_t *cmd_enc, uint8_t cmdsize, uint8_t *cmd, uint8_t *parity_enc) {

-       uint8_t parity[16];
-       oddparitybuf(cmd, cmdsize, parity);
-       printf("parity check. size=%d\n", cmdsize);
-       printf("cmd    =%s\n", sprint_hex(cmd, cmdsize));
-       printf("cmd_enc=%s\n", sprint_hex(cmd_enc, cmdsize));
-       printf("parity    =%s\n", printBitsPar(parity, cmdsize));
-       printf("parity_enc=%s\n", printBitsPar(parity_enc, cmdsize));
-//     (oddparity8(ntx >> 8 & 0xff) ^ (ntx & 0x01) ^ ((ad->nt_enc_par >> 5) & 0x01) ^ (ad->nt_enc & 0x01)) ||
-//     (oddparity8(ntx >> 24 & 0xff) ^ (ntx >> 16 & 0x01) ^ ((ad->nt_enc_par >> 7) & 0x01) ^ (ad->nt_enc >> 16 & 0x01))

        for (int i = 0; i < cmdsize - 1; i++) {
        for (int i = 0; i < cmdsize - 1; i++) {

-               bool b = oddparity8(cmd[i]) ^ (cmd[i + 1] & 0x01) ^ ((parity_enc[i / 8] >> (7 - i % 8)) & 0x01) ^ (cmd_enc[i + 1] & 0x01);
-               if (b)
-                       printf("!!! i=%d \n", i);
+               if (oddparity8(cmd[i]) ^ (cmd[i + 1] & 0x01) ^ ((parity_enc[i / 8] >> (7 - i % 8)) & 0x01) ^ (cmd_enc[i + 1] & 0x01))
+                       return false;

        }
        
        return true;
 }
        }
        
        return true;
 }

+
+uint64_t GetCrypto1ProbableKey(TAuthData *ad) {
+       struct Crypto1State *revstate = lfsr_recovery64(ad->ks2, ad->ks3);
+       lfsr_rollback_word(revstate, 0, 0);
+       lfsr_rollback_word(revstate, 0, 0);
+       lfsr_rollback_word(revstate, ad->nr_enc, 1);
+       lfsr_rollback_word(revstate, ad->uid ^ ad->nt, 0);
+
+       uint64_t lfsr = 0;
+       crypto1_get_lfsr(revstate, &lfsr);
+       crypto1_destroy(revstate);
+       
+       return lfsr;
+}