CHG: removed a delay in readblock

[proxmark3-svn] / client / cmdhfmfu.c

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 82289d5ba43c84110d7bf4313df087607ddfc190..1b43898039da18914e3c5211643a36ad5c44f4ec 100644 (file)
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -100,6 +100,38 @@ uint32_t ul_ev1_pwdgenB(uint8_t* uid) {
        return (uint32_t)bytes_to_num(pwd, 4);
 }
 
        return (uint32_t)bytes_to_num(pwd, 4);
 }
 

+// Certain pwd generation algo nickname C.
+uint32_t ul_ev1_pwdgenC(uint8_t* uid){
+       uint32_t pwd = 0;
+       uint8_t base[] = {
+               0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x28,
+               0x63, 0x29, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72,
+               0x69, 0x67, 0x68, 0x74, 0x20, 0x4c, 0x45, 0x47,
+               0x4f, 0x20, 0x32, 0x30, 0x31, 0x34, 0xaa, 0xaa
+       };
+
+       memcpy(base, uid, 7);
+
+       for (int i = 0; i < 32; i += 4) {
+               uint32_t b = *(uint32_t *)(base + i);
+               pwd = b + ROTR(pwd, 25) + ROTR(pwd, 10) - pwd;
+       }
+       return BSWAP_32(pwd);
+}
+
+// pack generation for algo 1-3
+uint16_t ul_ev1_packgenA(uint8_t* uid){
+       uint16_t pack = (uid[0] ^ uid[1] ^ uid[2]) << 8 | (uid[2] ^ 8);
+       return pack;
+}
+uint16_t ul_ev1_packgenB(uint8_t* uid){
+       return 0x8080;
+}
+uint16_t ul_ev1_packgenC(uint8_t* uid){
+       return 0xaa55;
+}
+
+

 void ul_ev1_pwdgen_selftest(){
        
        uint8_t uid1[] = {0x04,0x11,0x12,0x11,0x12,0x11,0x10};
 void ul_ev1_pwdgen_selftest(){
        
        uint8_t uid1[] = {0x04,0x11,0x12,0x11,0x12,0x11,0x10};


@@ -109,6 +141,10 @@ void ul_ev1_pwdgen_selftest(){
        uint8_t uid2[] = {0x04,0x1f,0x98,0xea,0x1e,0x3e,0x81};          
        uint32_t pwd2 = ul_ev1_pwdgenB(uid2);
        PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid2,7), pwd2, (pwd2 == 0x5fd37eca)?"OK":"->5fd37eca<--");
        uint8_t uid2[] = {0x04,0x1f,0x98,0xea,0x1e,0x3e,0x81};          
        uint32_t pwd2 = ul_ev1_pwdgenB(uid2);
        PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid2,7), pwd2, (pwd2 == 0x5fd37eca)?"OK":"->5fd37eca<--");

+
+       uint8_t uid3[] = {0x04,0x62, 0xB6, 0x8A, 0xB4, 0x42, 0x80};
+       uint32_t pwd3 = ul_ev1_pwdgenC(uid3);
+       PrintAndLog("UID | %s | %08X | %s", sprint_hex(uid3,7), pwd3, (pwd3 == 0x5a349515)?"OK":"->5a349515<--");

        return;
 }
 
        return;
 }
 


@@ -915,6 +951,14 @@ int CmdHF14AMfUInfo(const char *Cmd){
                                PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
                        }
                        if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;
                                PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
                        }
                        if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;

+
+                       // test pwd gen C
+                       num_to_bytes( ul_ev1_pwdgenC(card.uid), 4, key);
+                       len = ulev1_requestAuthentication(key, pack, sizeof(pack));
+                       if (len >= 1) {
+                               PrintAndLog("Found a default password: %s || Pack: %02X %02X",sprint_hex(key, 4), pack[0], pack[1]);
+                       }
+                       if (!ul_auth_select( &card, tagtype, hasAuthKey, authkeyptr, pack, sizeof(pack))) return -1;                    

                        
                        for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) {
                                key = default_pwd_pack[i];
                        
                        for (uint8_t i = 0; i < KEYS_PWD_COUNT; ++i ) {
                                key = default_pwd_pack[i];


@@ -1252,24 +1296,26 @@ int usage_hf_mfu_eload(void) {
        PrintAndLog("Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
        PrintAndLog("  Options:");
        PrintAndLog("    h          : this help");      
        PrintAndLog("Usage:  hf mfu eload u <file name w/o `.eml`> [numblocks]");
        PrintAndLog("  Options:");
        PrintAndLog("    h          : this help");      

-       PrintAndLog("    u          : UL");
-       PrintAndLog("    numblocks  : number of blocks to load from eml file");         
+       PrintAndLog("    u          : UL (required)");
+       PrintAndLog("    [filename] : without `.eml` (required)");      
+       PrintAndLog("    numblocks  : number of blocks to load from eml file (optional)");

        PrintAndLog("");
        PrintAndLog("  sample: hf mfu eload u filename");
        PrintAndLog("          hf mfu eload u filename 57");
        PrintAndLog("");
        PrintAndLog("  sample: hf mfu eload u filename");
        PrintAndLog("          hf mfu eload u filename 57");

-       return 0;
+                       return 0;

 }
 
 int usage_hf_mfu_sim(void) {
        PrintAndLog("\nEmulating Ultralight tag from emulator memory\n");
        PrintAndLog("\nBe sure to load the emulator memory first!\n");
        PrintAndLog("Usage: hf mfu sim t 7 u <uid>");
 }
 
 int usage_hf_mfu_sim(void) {
        PrintAndLog("\nEmulating Ultralight tag from emulator memory\n");
        PrintAndLog("\nBe sure to load the emulator memory first!\n");
        PrintAndLog("Usage: hf mfu sim t 7 u <uid>");

-       PrintAndLog("  Options : ");
-       PrintAndLog("    h     : this help");
-       PrintAndLog("    t     : 7 = NTAG or Ultralight sim");
-       PrintAndLog("    u     : 4 or 7 byte UID");
+       PrintAndLog("  Options:");
+       PrintAndLog("    h       : this help");
+       PrintAndLog("    t 7     : 7 = NTAG or Ultralight sim (required)");
+       PrintAndLog("    u <uid> : 4 or 7 byte UID (optional)");

        PrintAndLog("\n   sample : hf mfu sim t 7");
        PrintAndLog("          : hf mfu sim t 7 u 1122344556677\n");
        PrintAndLog("\n   sample : hf mfu sim t 7");
        PrintAndLog("          : hf mfu sim t 7 u 1122344556677\n");

+       

        return 0;
 }
 
        return 0;
 }
 


@@ -1314,6 +1360,14 @@ int  usage_hf_mfu_gendiverse(void){
        return 0;
 }
 
        return 0;
 }
 

+int  usage_hf_mfu_pwdgen(void){
+       PrintAndLog("Usage:  hf mfu pwdgen <uid (14 hex symbols)>");
+       PrintAndLog("");
+       PrintAndLog("sample: hf mfu pwdgen 11223344556677");
+       PrintAndLog("");
+       return 0;
+}
+

 #define DUMP_PREFIX_LENGTH 48 
 //
 //  Mifare Ultralight / Ultralight-C / Ultralight-EV1
 #define DUMP_PREFIX_LENGTH 48 
 //
 //  Mifare Ultralight / Ultralight-C / Ultralight-EV1


@@ -1401,6 +1455,7 @@ int CmdHF14AMfUDump(const char *Cmd){
        //Validations
        if(errors) return usage_hf_mfu_dump();
 
        //Validations
        if(errors) return usage_hf_mfu_dump();
 

+       //if we entered a key in little endian and set the swapEndian switch - switch it...

        if (swapEndian && hasAuthKey) 
                authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
 
        if (swapEndian && hasAuthKey) 
                authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
 


@@ -1467,34 +1522,8 @@ int CmdHF14AMfUDump(const char *Cmd){
                }
        }
 
                }
        }
 

-       // add keys to block dump
-       if (hasAuthKey) {
-               if (!swapEndian){
-                       authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
-               } else {
-                       authKeyPtr = authenticationkey;
-               }
-
-               if (tagtype & UL_C){ //add 4 pages
-                       memcpy(data + Pages*4, authKeyPtr, dataLen);
-                       Pages += dataLen/4;  
-               } else { // 2nd page from end
-                       memcpy(data + (Pages*4) - 8, authenticationkey, dataLen);
-               }
-       }
-

        uint8_t get_pack[] = {0,0};
        iso14a_card_select_t card;
        uint8_t get_pack[] = {0,0};
        iso14a_card_select_t card;

-       //attempt to read pack
-       if (!ul_auth_select( &card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) {
-               //reset pack
-               get_pack[0]=0;
-               get_pack[1]=0;
-       }
-       ul_switch_off_field();
-       // add pack to block read
-       memcpy(data + (Pages*4) - 4, get_pack, sizeof(get_pack));
-

        uint8_t dump_file_data[1024+DUMP_PREFIX_LENGTH] = {0x00};
        uint8_t get_version[] = {0,0,0,0,0,0,0,0,0};
        uint8_t get_tearing[] = {0,0,0};
        uint8_t dump_file_data[1024+DUMP_PREFIX_LENGTH] = {0x00};
        uint8_t get_version[] = {0,0,0,0,0,0,0,0,0};
        uint8_t get_tearing[] = {0,0,0};


@@ -1503,6 +1532,17 @@ int CmdHF14AMfUDump(const char *Cmd){
        uint8_t get_signature[32];
        memset( get_signature, 0, sizeof(get_signature) );
 
        uint8_t get_signature[32];
        memset( get_signature, 0, sizeof(get_signature) );
 

+       // not ul_c and not std ul then attempt to get deeper info
+       if (!(tagtype & UL_C || tagtype & UL)) {
+               //attempt to read pack
+               if (!ul_auth_select( &card, tagtype, true, authKeyPtr, get_pack, sizeof(get_pack))) {
+                       //reset pack
+                       get_pack[0]=0;
+                       get_pack[1]=0;
+               }
+               ul_switch_off_field();
+               // add pack to block read
+               memcpy(data + (Pages*4) - 4, get_pack, sizeof(get_pack));

        if ( hasAuthKey )
                ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
        else
        if ( hasAuthKey )
                ul_auth_select( &card, tagtype, hasAuthKey, authKeyPtr, dummy_pack, sizeof(dummy_pack));
        else


@@ -1520,6 +1560,28 @@ int CmdHF14AMfUDump(const char *Cmd){
                ul_select(&card);
        ulev1_readSignature( get_signature, sizeof(get_signature));
        ul_switch_off_field();
                ul_select(&card);
        ulev1_readSignature( get_signature, sizeof(get_signature));
        ul_switch_off_field();

+       }
+
+       // format and add keys to block dump output
+       if (hasAuthKey) {
+               // if we didn't swapendian before - do it now for the sprint_hex call
+               // NOTE: default entry is bigendian (unless swapped), sprint_hex outputs little endian
+               //       need to swap to keep it the same
+               if (!swapEndian){
+                       authKeyPtr = SwapEndian64(authenticationkey, dataLen, (dataLen == 16) ? 8 : 4);
+               } else {
+                       authKeyPtr = authenticationkey;
+               }
+
+               if (tagtype & UL_C){ //add 4 pages
+                       memcpy(data + Pages*4, authKeyPtr, dataLen);
+                       Pages += dataLen/4;  
+               } else { // 2nd page from end
+                       memcpy(data + (Pages*4) - 8, authenticationkey, dataLen);
+               }
+       }
+
+       //add *special* blocks to dump

        //get version
        memcpy(dump_file_data, get_version, sizeof(get_version));
        //tearing
        //get version
        memcpy(dump_file_data, get_version, sizeof(get_version));
        //tearing


@@ -1528,16 +1590,17 @@ int CmdHF14AMfUDump(const char *Cmd){
        memcpy(dump_file_data+13, get_pack, sizeof(get_pack));
        //signature
        memcpy(dump_file_data+16, get_signature, sizeof(get_signature));
        memcpy(dump_file_data+13, get_pack, sizeof(get_pack));
        //signature
        memcpy(dump_file_data+16, get_signature, sizeof(get_signature));

-       //block read data
+       //add regular block read data to dump

        memcpy(dump_file_data+DUMP_PREFIX_LENGTH, data, Pages*4);
 
        memcpy(dump_file_data+DUMP_PREFIX_LENGTH, data, Pages*4);
 

+       PrintAndLog("\n*Special* block data:");

        PrintAndLog("\nDataType| Data        |   | Ascii");
        PrintAndLog("---------------------------------");
        PrintAndLog("GetVer-1| %s|   | %.4s", sprint_hex(dump_file_data, 4), dump_file_data);
        PrintAndLog("GetVer-2| %s|   | %.4s", sprint_hex(dump_file_data+4, 4), dump_file_data+4);
        PrintAndLog("TBD     | 00 00       |   | ");
        PrintAndLog("Tearing |    %s|   | %.3s", sprint_hex(dump_file_data+10, 3), dump_file_data+10);
        PrintAndLog("\nDataType| Data        |   | Ascii");
        PrintAndLog("---------------------------------");
        PrintAndLog("GetVer-1| %s|   | %.4s", sprint_hex(dump_file_data, 4), dump_file_data);
        PrintAndLog("GetVer-2| %s|   | %.4s", sprint_hex(dump_file_data+4, 4), dump_file_data+4);
        PrintAndLog("TBD     | 00 00       |   | ");
        PrintAndLog("Tearing |    %s|   | %.3s", sprint_hex(dump_file_data+10, 3), dump_file_data+10);

-       PrintAndLog("Pack    |    %s   |    | %.2s", sprint_hex(dump_file_data+13, 2), dump_file_data+13);
+       PrintAndLog("Pack    |    %s   |   | %.2s", sprint_hex(dump_file_data+13, 2), dump_file_data+13);

        PrintAndLog("TBD     |          00 |   | ");
        PrintAndLog("Sig-1   | %s|   | %.4s", sprint_hex(dump_file_data+16, 4), dump_file_data+16);
        PrintAndLog("Sig-2   | %s|   | %.4s", sprint_hex(dump_file_data+20, 4), dump_file_data+20);
        PrintAndLog("TBD     |          00 |   | ");
        PrintAndLog("Sig-1   | %s|   | %.4s", sprint_hex(dump_file_data+16, 4), dump_file_data+16);
        PrintAndLog("Sig-2   | %s|   | %.4s", sprint_hex(dump_file_data+20, 4), dump_file_data+20);


@@ -1547,12 +1610,11 @@ int CmdHF14AMfUDump(const char *Cmd){
        PrintAndLog("Sig-6   | %s|   | %.4s", sprint_hex(dump_file_data+36, 4), dump_file_data+36);
        PrintAndLog("Sig-7   | %s|   | %.4s", sprint_hex(dump_file_data+40, 4), dump_file_data+40);
        PrintAndLog("Sig-8   | %s|   | %.4s", sprint_hex(dump_file_data+44, 4), dump_file_data+44);
        PrintAndLog("Sig-6   | %s|   | %.4s", sprint_hex(dump_file_data+36, 4), dump_file_data+36);
        PrintAndLog("Sig-7   | %s|   | %.4s", sprint_hex(dump_file_data+40, 4), dump_file_data+40);
        PrintAndLog("Sig-8   | %s|   | %.4s", sprint_hex(dump_file_data+44, 4), dump_file_data+44);

-       

        PrintAndLog("\nBlock#  | Data        |lck| Ascii");
        PrintAndLog("---------------------------------");
        for (i = 0; i < Pages; ++i) {
                if ( i < 3 ) {
        PrintAndLog("\nBlock#  | Data        |lck| Ascii");
        PrintAndLog("---------------------------------");
        for (i = 0; i < Pages; ++i) {
                if ( i < 3 ) {

-                       PrintAndLog("%02d/0x%02X | %s|   | ", i+startPage, i+startPage, sprint_hex(data + i * 4, 4));
+                       PrintAndLog("%02d/0x%02X | %s|   | %.4s", i+startPage, i+startPage, sprint_hex(data + i * 4, 4), data + i * 4 );

                        continue;
                }
                switch(i){
                        continue;
                }
                switch(i){


@@ -1617,9 +1679,11 @@ int CmdHF14AMfUDump(const char *Cmd){
                return 1;
        }
        fwrite( dump_file_data, 1, Pages*4 + DUMP_PREFIX_LENGTH, fout );
                return 1;
        }
        fwrite( dump_file_data, 1, Pages*4 + DUMP_PREFIX_LENGTH, fout );

-       fclose(fout);
-       
-       PrintAndLog("Dumped %d pages, wrote %d bytes to %s", Pages+12, (Pages+12)*4, filename);
+       if (fout) {
+               fclose(fout);
+               fout = NULL;
+       }
+       PrintAndLog("Dumped %d pages, wrote %d bytes to %s", Pages+(DUMP_PREFIX_LENGTH/4), Pages*4 + DUMP_PREFIX_LENGTH, filename);

        return 0;
 }
 
        return 0;
 }
 


@@ -1640,7 +1704,7 @@ int CmdHF14AMfucAuth(const char *Cmd){
        //Change key to user defined one
        if (cmdp == 'k' || cmdp == 'K'){
                keyNo = param_get8(Cmd, 1);
        //Change key to user defined one
        if (cmdp == 'k' || cmdp == 'K'){
                keyNo = param_get8(Cmd, 1);

-               if(keyNo > KEYS_3DES_COUNT) 
+               if(keyNo >= KEYS_3DES_COUNT) 

                        errors = true;
        }
 
                        errors = true;
        }
 


@@ -1776,14 +1840,13 @@ int CmdHF14AMfucSetPwd(const char *Cmd){
 
        UsbCommand resp;
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {
 
        UsbCommand resp;
        if (WaitForResponseTimeout(CMD_ACK,&resp,1500) ) {

-               if ( (resp.arg[0] & 0xff) == 1)
+               if ( (resp.arg[0] & 0xff) == 1) {

                        PrintAndLog("Ultralight-C new password: %s", sprint_hex(pwd,16));
                        PrintAndLog("Ultralight-C new password: %s", sprint_hex(pwd,16));

-               else{
+               } else {

                        PrintAndLog("Failed writing at block %d", resp.arg[1] & 0xff);
                        return 1;
                }
                        PrintAndLog("Failed writing at block %d", resp.arg[1] & 0xff);
                        return 1;
                }

-       }
-       else {
+       } else {

                PrintAndLog("command execution time out");
                return 1;
        }       
                PrintAndLog("command execution time out");
                return 1;
        }       


@@ -1799,6 +1862,7 @@ int CmdHF14AMfucSetUid(const char *Cmd){
        UsbCommand resp;
        uint8_t uid[7] = {0x00};
        char cmdp = param_getchar(Cmd, 0);
        UsbCommand resp;
        uint8_t uid[7] = {0x00};
        char cmdp = param_getchar(Cmd, 0);

+       

        if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_ucsetuid();
 
        if (param_gethex(Cmd, 0, uid, 14)) {
        if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_ucsetuid();
 
        if (param_gethex(Cmd, 0, uid, 14)) {


@@ -1866,7 +1930,6 @@ int CmdHF14AMfucSetUid(const char *Cmd){
 int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 
        uint8_t uid[4]; 
 int CmdHF14AMfuGenDiverseKeys(const char *Cmd){
 
        uint8_t uid[4]; 

-       

        char cmdp = param_getchar(Cmd, 0);
        if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_gendiverse();
 
        char cmdp = param_getchar(Cmd, 0);
        if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_gendiverse();
 


@@ -1964,6 +2027,20 @@ int CmdHF14AMfUSim(const char *Cmd) {
        return CmdHF14ASim(Cmd);
 }
 
        return CmdHF14ASim(Cmd);
 }
 

+int CmdHF14AMfuPwdGen(const char *Cmd){
+       uint8_t uid[7] = {0x00};        
+       char cmdp = param_getchar(Cmd, 0);
+       if (strlen(Cmd) == 0  || cmdp == 'h' || cmdp == 'H') return usage_hf_mfu_pwdgen();
+
+       if (param_gethex(Cmd, 0, uid, 14)) return usage_hf_mfu_pwdgen();
+       
+       PrintAndLog(" algo | pwd      | pack");
+       PrintAndLog("------+----------+-----");
+       PrintAndLog(" EV1  | %08X | %04X", ul_ev1_pwdgenA(uid), ul_ev1_packgenA(uid));
+       PrintAndLog(" Ami  | %08X | %04X", ul_ev1_pwdgenB(uid), ul_ev1_packgenB(uid));
+       PrintAndLog(" LD   | %08X | %04X", ul_ev1_pwdgenC(uid), ul_ev1_packgenC(uid));
+       return 0;
+}

 //------------------------------------
 // Menu Stuff
 //------------------------------------
 //------------------------------------
 // Menu Stuff
 //------------------------------------


@@ -1981,11 +2058,13 @@ static command_t CommandTable[] =
        {"setuid",      CmdHF14AMfucSetUid, 0, "Set UID - MAGIC tags only"},
        {"sim",         CmdHF14AMfUSim,     0, "Simulate Ultralight from emulator memory"},             
        {"gen",         CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},
        {"setuid",      CmdHF14AMfucSetUid, 0, "Set UID - MAGIC tags only"},
        {"sim",         CmdHF14AMfUSim,     0, "Simulate Ultralight from emulator memory"},             
        {"gen",         CmdHF14AMfuGenDiverseKeys , 1, "Generate 3des mifare diversified keys"},

+       {"pwdgen",      CmdHF14AMfuPwdGen, 1, "Generate pwd from known algos"},

        {NULL, NULL, 0, NULL}
 };
 
 int CmdHFMFUltra(const char *Cmd){
        {NULL, NULL, 0, NULL}
 };
 
 int CmdHFMFUltra(const char *Cmd){

-       WaitForResponseTimeout(CMD_ACK,NULL,100);
+       clearCommandBuffer();
+       //WaitForResponseTimeout(CMD_ACK,NULL,100);

        CmdsParse(CommandTable, Cmd);
        return 0;
 }
        CmdsParse(CommandTable, Cmd);
        return 0;
 }