X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9cdd47c292377a04be69fd00d53d4a10cc503d4f..07291f87d8c6cfa3a7179776937df9eadc20f04d:/client/cmdhf14a.c diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index 2200531e..33a4234c 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -24,9 +24,8 @@ #include "cmdmain.h" #include "mifare.h" #include "cmdhfmfu.h" -#include "nonce2key/crapto1.h" - -#define llx PRIx64 +#include "nonce2key/nonce2key.h" +#include "cmdhf.h" static int CmdHelp(const char *Cmd); static void waitCmd(uint8_t iLen); @@ -127,17 +126,60 @@ char* getTagInfo(uint8_t uid) { return manufactureMapping[len-1].desc; } + +int usage_hf_14a_sim(void) { + PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID\n"); + PrintAndLog("Usage: hf 14a sim t u x"); + PrintAndLog(" Options : "); + PrintAndLog(" h : this help"); + PrintAndLog(" t : 1 = MIFARE Classic"); + PrintAndLog(" 2 = MIFARE Ultralight"); + PrintAndLog(" 3 = MIFARE Desfire"); + PrintAndLog(" 4 = ISO/IEC 14443-4"); + PrintAndLog(" 5 = MIFARE Tnp3xxx"); + PrintAndLog(" 6 = MIFARE Mini"); + PrintAndLog(" 7 = AMIIBO (NTAG 215), pack 0x8080"); + PrintAndLog(" u : 4 or 7 byte UID"); + PrintAndLog(" x : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader"); + PrintAndLog("\n sample : hf 14a sim t 1 u 1122344"); + PrintAndLog(" : hf 14a sim t 1 u 1122344 x\n"); + return 0; +} +int usage_hf_14a_sniff(void){ + PrintAndLog("It get data from the field and saves it into command buffer."); + PrintAndLog("Buffer accessible from command 'hf list 14a'"); + PrintAndLog("Usage: hf 14a sniff [c][r]"); + PrintAndLog("c - triggered by first data from card"); + PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)"); + PrintAndLog("sample: hf 14a sniff c r"); + return 0; +} +int usage_hf_14a_raw(void){ + PrintAndLog("Usage: hf 14a raw [-h] [-r] [-c] [-p] [-a] [-T] [-t] [-b] <0A 0B 0C ... hex>"); + PrintAndLog(" -h this help"); + PrintAndLog(" -r do not read response"); + PrintAndLog(" -c calculate and append CRC"); + PrintAndLog(" -p leave the signal field ON after receive"); + PrintAndLog(" -a active signal field ON without select"); + PrintAndLog(" -s active signal field ON with select"); + PrintAndLog(" -b number of bits to send. Useful for send partial byte"); + PrintAndLog(" -t timeout in ms"); + PrintAndLog(" -T use Topaz protocol to send command"); + return 0; +} + int CmdHF14AList(const char *Cmd) { - PrintAndLog("Deprecated command, use 'hf list 14a' instead"); + //PrintAndLog("Deprecated command, use 'hf list 14a' instead"); + CmdHFList("14a"); return 0; } int CmdHF14AReader(const char *Cmd) { UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}}; + clearCommandBuffer(); SendCommand(&c); - UsbCommand resp; WaitForResponse(CMD_ACK,&resp); @@ -177,7 +219,7 @@ int CmdHF14AReader(const char *Cmd) //***************************************test**************** ul_switch_off_field(); - uint16_t tagT = GetHF14AMfU_Type(); + uint32_t tagT = GetHF14AMfU_Type(); ul_print_type(tagT, 0); //reconnect for further tests @@ -185,6 +227,7 @@ int CmdHF14AReader(const char *Cmd) c.arg[1] = 0; c.arg[2] = 0; + clearCommandBuffer(); SendCommand(&c); UsbCommand resp; @@ -248,6 +291,7 @@ int CmdHF14AReader(const char *Cmd) c.arg[1] = 2; c.arg[2] = 0; memcpy(c.d.asBytes, rats, 2); + clearCommandBuffer(); SendCommand(&c); WaitForResponse(CMD_ACK,&resp); @@ -345,16 +389,16 @@ int CmdHF14AReader(const char *Cmd) PrintAndLog(" x0 -> <1 kByte"); break; case 0x01: - PrintAndLog(" x0 -> 1 kByte"); + PrintAndLog(" x1 -> 1 kByte"); break; case 0x02: - PrintAndLog(" x0 -> 2 kByte"); + PrintAndLog(" x2 -> 2 kByte"); break; case 0x03: - PrintAndLog(" x0 -> 4 kByte"); + PrintAndLog(" x3 -> 4 kByte"); break; case 0x04: - PrintAndLog(" x0 -> 8 kByte"); + PrintAndLog(" x4 -> 8 kByte"); break; } switch (card.ats[pos + 3] & 0xf0) { @@ -395,14 +439,17 @@ int CmdHF14AReader(const char *Cmd) // try to see if card responses to "chinese magic backdoor" commands. + uint8_t isOK = 0; + clearCommandBuffer(); c.cmd = CMD_MIFARE_CIDENT; c.arg[0] = 0; c.arg[1] = 0; c.arg[2] = 0; SendCommand(&c); - WaitForResponse(CMD_ACK,&resp); - uint8_t isOK = resp.arg[0] & 0xff; - PrintAndLog("Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") ); + if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) + isOK = resp.arg[0] & 0xff; + + PrintAndLog("Answers to magic commands (GEN1): %s", (isOK ? "YES" : "NO") ); // disconnect c.cmd = CMD_READER_ISO_14443a; @@ -451,26 +498,6 @@ int CmdHF14ACUIDs(const char *Cmd) return 1; } - -static int usage_hf_14a_sim(void) -{ - PrintAndLog("\n Emulating ISO/IEC 14443 type A tag with 4 or 7 byte UID\n"); - PrintAndLog("Usage: hf 14a sim t u x"); - PrintAndLog(" Options : "); - PrintAndLog(" h : this help"); - PrintAndLog(" t : 1 = MIFARE Classic"); - PrintAndLog(" 2 = MIFARE Ultralight"); - PrintAndLog(" 3 = MIFARE Desfire"); - PrintAndLog(" 4 = ISO/IEC 14443-4"); - PrintAndLog(" 5 = MIFARE Tnp3xxx"); - PrintAndLog(" 6 = MIFARE Mini"); - PrintAndLog(" u : 4 or 7 byte UID"); - PrintAndLog(" x : (Optional) performs the 'reader attack', nr/ar attack against a legitimate reader"); - PrintAndLog("\n sample : hf 14a sim t 1 u 1122344"); - PrintAndLog(" : hf 14a sim t 1 u 1122344 x\n"); - return 0; -} - // ## simulate iso14443a tag // ## greg - added ability to specify tag UID int CmdHF14ASim(const char *Cmd) @@ -480,7 +507,7 @@ int CmdHF14ASim(const char *Cmd) uint8_t tagtype = 1; uint64_t uid = 0; uint8_t cmdp = 0; - + while(param_getchar(Cmd, cmdp) != 0x00) { switch(param_getchar(Cmd, cmdp)) @@ -531,122 +558,28 @@ int CmdHF14ASim(const char *Cmd) PrintAndLog("Press pm3-button to abort simulation"); UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443a,{ tagtype, flags, 0 }}; + num_to_bytes(uid, 7, c.d.asBytes); + clearCommandBuffer(); SendCommand(&c); + uint8_t data[40]; + uint8_t key[6]; + UsbCommand resp; while(!ukbhit()){ - UsbCommand resp; - WaitForResponseTimeout(CMD_ACK,&resp,1500); - PrintAndLog("Got %04X %02X", resp.arg[0], resp.arg[0]); - if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){ - uint8_t data[40]; - uint8_t key[6]; - int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1]; - memcpy(data, resp.d.asBytes, len); - tryMfk32(uid, data, key); - //tryMfk64(uid, data, key); - PrintAndLog("--"); - memset(data,0x00, 40); - } - } - return 0; -} - -int tryMfk32(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){ - - struct Crypto1State *s,*t; - uint64_t key; // recovered key - uint32_t uid; // serial number - uint32_t nt; // tag challenge - uint32_t nr0_enc; // first encrypted reader challenge - uint32_t ar0_enc; // first encrypted reader response - uint32_t nr1_enc; // second encrypted reader challenge - uint32_t ar1_enc; // second encrypted reader response - bool isSuccess = FALSE; - int counter = 0; - - uid = myuid;//(uint32_t)bytes_to_num(data + 0, 4); - nt = *(uint32_t*)(data+8); - nr0_enc = *(uint32_t*)(data+12); - ar0_enc = *(uint32_t*)(data+16); - nr1_enc = *(uint32_t*)(data+32); - ar1_enc = *(uint32_t*)(data+36); - - // PrintAndLog("Recovering key for:"); - // PrintAndLog(" uid: %08x",uid); - // PrintAndLog(" nt: %08x",nt); - // PrintAndLog(" {nr_0}: %08x",nr0_enc); - // PrintAndLog(" {ar_0}: %08x",ar0_enc); - // PrintAndLog(" {nr_1}: %08x",nr1_enc); - // PrintAndLog(" {ar_1}: %08x",ar1_enc); - - s = lfsr_recovery32(ar0_enc ^ prng_successor(nt, 64), 0); - - for(t = s; t->odd | t->even; ++t) { - lfsr_rollback_word(t, 0, 0); - lfsr_rollback_word(t, nr0_enc, 1); - lfsr_rollback_word(t, uid ^ nt, 0); - crypto1_get_lfsr(t, &key); - crypto1_word(t, uid ^ nt, 0); - crypto1_word(t, nr1_enc, 1); - if (ar1_enc == (crypto1_word(t, 0, 0) ^ prng_successor(nt, 64))) { - PrintAndLog("Found Key: [%012"llx"]",key); - isSuccess = TRUE; - ++counter; - if (counter==10) - break; + if ( WaitForResponseTimeout(CMD_ACK,&resp,1500)) { + if ( (resp.arg[0] & 0xffff) == CMD_SIMULATE_MIFARE_CARD ){ + memset(data, 0x00, sizeof(data)); + memset(key, 0x00, sizeof(key)); + int len = (resp.arg[1] > sizeof(data)) ? sizeof(data) : resp.arg[1]; + memcpy(data, resp.d.asBytes, len); + tryMfk32(uid, data, key); + //tryMfk32_moebius(uid, data, key); + //tryMfk64(uid, data, key); + PrintAndLog("--"); + } } } - free(s); - return isSuccess; -} - -int tryMfk64(uint64_t myuid, uint8_t *data, uint8_t *outputkey ){ - - struct Crypto1State *revstate; - uint64_t key; // recovered key - uint32_t uid; // serial number - uint32_t nt; // tag challenge - uint32_t nr_enc; // encrypted reader challenge - uint32_t ar_enc; // encrypted reader response - uint32_t at_enc; // encrypted tag response - uint32_t ks2; // keystream used to encrypt reader response - uint32_t ks3; // keystream used to encrypt tag response - - struct Crypto1State mpcs = {0, 0}; - struct Crypto1State *pcs; - pcs = &mpcs; - - - - uid = myuid;//(uint32_t)bytes_to_num(data + 0, 4); - nt = *(uint32_t*)(data+8); - nr_enc = *(uint32_t*)(data+12); - ar_enc = *(uint32_t*)(data+16); - - crypto1_word(pcs, nr_enc , 1); - at_enc = prng_successor(nt, 96) ^ crypto1_word(pcs, 0, 0); - - // printf("Recovering key for:\n"); - // printf(" uid: %08x\n",uid); - // printf(" nt: %08x\n",nt); - // printf(" {nr}: %08x\n",nr_enc); - // printf(" {ar}: %08x\n",ar_enc); - // printf(" {at}: %08x\n",at_enc); - - // Extract the keystream from the messages - ks2 = ar_enc ^ prng_successor(nt, 64); - ks3 = at_enc ^ prng_successor(nt, 96); - - revstate = lfsr_recovery64(ks2, ks3); - lfsr_rollback_word(revstate, 0, 0); - lfsr_rollback_word(revstate, 0, 0); - lfsr_rollback_word(revstate, nr_enc, 1); - lfsr_rollback_word(revstate, uid ^ nt, 0); - crypto1_get_lfsr(revstate, &key); - PrintAndLog("Found Key: [%012"llx"]",key); - crypto1_destroy(revstate); - crypto1_destroy(pcs); return 0; } @@ -654,15 +587,7 @@ int CmdHF14ASniff(const char *Cmd) { int param = 0; uint8_t ctmp = param_getchar(Cmd, 0) ; - if (ctmp == 'h' || ctmp == 'H') { - PrintAndLog("It get data from the field and saves it into command buffer."); - PrintAndLog("Buffer accessible from command 'hf list 14a'"); - PrintAndLog("Usage: hf 14a sniff [c][r]"); - PrintAndLog("c - triggered by first data from card"); - PrintAndLog("r - triggered by first 7-bit request from reader (REQ,WUP,...)"); - PrintAndLog("sample: hf 14a sniff c r"); - return 0; - } + if (ctmp == 'h' || ctmp == 'H') return usage_hf_14a_sniff(); for (int i = 0; i < 2; i++) { ctmp = param_getchar(Cmd, i); @@ -671,11 +596,11 @@ int CmdHF14ASniff(const char *Cmd) { } UsbCommand c = {CMD_SNOOP_ISO_14443a, {param, 0, 0}}; + clearCommandBuffer(); SendCommand(&c); return 0; } - int CmdHF14ACmdRaw(const char *cmd) { UsbCommand c = {CMD_READER_ISO_14443a, {0, 0, 0}}; bool reply=1; @@ -693,19 +618,7 @@ int CmdHF14ACmdRaw(const char *cmd) { uint16_t datalen=0; uint32_t temp; - if (strlen(cmd)<2) { - PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-a] [-t] [-b] <0A 0B 0C ... hex>"); - PrintAndLog(" -r do not read response"); - PrintAndLog(" -c calculate and append CRC"); - PrintAndLog(" -p leave the signal field ON after receive"); - PrintAndLog(" -a active signal field ON without select"); - PrintAndLog(" -s active signal field ON with select"); - PrintAndLog(" -b number of bits to send. Useful for send partial byte"); - PrintAndLog(" -t timeout in ms"); - PrintAndLog(" -T use Topaz protocol to send command"); - return 0; - } - + if (strlen(cmd)<2) return usage_hf_14a_raw(); // strip while (*cmd==' ' || *cmd=='\t') cmd++; @@ -714,6 +627,9 @@ int CmdHF14ACmdRaw(const char *cmd) { if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; } if (cmd[i]=='-') { switch (cmd[i+1]) { + case 'H': + case 'h': + return usage_hf_14a_raw(); case 'r': reply = FALSE; break; @@ -748,8 +664,7 @@ int CmdHF14ACmdRaw(const char *cmd) { topazmode = TRUE; break; default: - PrintAndLog("Invalid option"); - return 0; + return usage_hf_14a_raw(); } i+=2; continue; @@ -814,11 +729,14 @@ int CmdHF14ACmdRaw(const char *cmd) { if(topazmode) c.arg[0] |= ISO14A_TOPAZMODE; - + // Max buffer is USB_CMD_DATA_SIZE - c.arg[1] = (datalen & 0xFFFF) | (numbits << 16); + datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen; + + c.arg[1] = (datalen & 0xFFFF) | (uint32_t)(numbits << 16); memcpy(c.d.asBytes,data,datalen); + clearCommandBuffer(); SendCommand(&c); if (reply) { @@ -830,9 +748,7 @@ int CmdHF14ACmdRaw(const char *cmd) { return 0; } - -static void waitCmd(uint8_t iSelect) -{ +static void waitCmd(uint8_t iSelect) { uint8_t *recv; UsbCommand resp; char *hexout; @@ -872,7 +788,8 @@ static command_t CommandTable[] = int CmdHF14A(const char *Cmd) { // flush - WaitForResponseTimeout(CMD_ACK,NULL,100); + clearCommandBuffer(); + //WaitForResponseTimeout(CMD_ACK,NULL,100); // parse CmdsParse(CommandTable, Cmd);