X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5636ee8ce6c74cd49ea204c838b77115c5a144e1..6063655a3ca719d224c61ece09645cedd5b4818c:/client/cmdhf14b.c?ds=sidebyside diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c index 39232a0a..2e90bc4b 100644 --- a/client/cmdhf14b.c +++ b/client/cmdhf14b.c @@ -22,13 +22,15 @@ #include "cmdhf14b.h" #include "cmdmain.h" #include "cmdhf14a.h" +#include "tea.h" +#include "cmdhf.h" +#include "prng.h" +#include "sha1.h" static int CmdHelp(const char *Cmd); -int CmdHF14BList(const char *Cmd) -{ - PrintAndLog("Deprecated command, use 'hf list 14b' instead"); - +int CmdHF14BList(const char *Cmd) { + CmdHFList("14b"); return 0; } @@ -64,24 +66,26 @@ int CmdSri512Read(const char *Cmd) * SRIX4K tags are ISO14443-B modulated memory tags, * this command just dumps the contents of the memory/ */ -int CmdSrix4kRead(const char *Cmd) -{ +int CmdSrix4kRead(const char *Cmd) { UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}}; clearCommandBuffer(); SendCommand(&c); return 0; } - -int rawClose(void){ +static int rawCloseEx(bool verbose){ UsbCommand resp; UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; clearCommandBuffer(); SendCommand(&c); - if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) { - return 0; + if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { + if ( verbose ) PrintAndLog("Command time-out"); + return 0; } - return 0; + return 1; +} +static int rawClose() { + return rawCloseEx(false); } int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){ @@ -349,7 +353,7 @@ int print_ST_Lock_info(uint8_t model){ case 0x7: // (SRI4K) //only need data[3] blk1 = 9; - PrintAndLog(" raw: %s",printBits(1,data+3)); + PrintAndLog(" raw: %s", sprint_bin(data+3, 1)); PrintAndLog(" 07/08:%slocked", (data[3] & 1) ? " not " : " " ); for (uint8_t i = 1; i<8; i++){ PrintAndLog(" %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " ); @@ -361,7 +365,7 @@ int print_ST_Lock_info(uint8_t model){ case 0xC: // (SRT512) //need data[2] and data[3] blk1 = 0; - PrintAndLog(" raw: %s",printBits(2,data+2)); + PrintAndLog(" raw: %s", sprint_bin(data+2, 2)); for (uint8_t b=2; b<4; b++){ for (uint8_t i=0; i<8; i++){ PrintAndLog(" %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " ); @@ -372,7 +376,7 @@ int print_ST_Lock_info(uint8_t model){ case 0x2: // (SR176) //need data[2] blk1 = 0; - PrintAndLog(" raw: %s",printBits(1,data+2)); + PrintAndLog(" raw: %s", sprint_bin(data+2, 1)); for (uint8_t i = 0; i<8; i++){ PrintAndLog(" %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " ); blk1+=2; @@ -394,7 +398,7 @@ static void print_st_general_info(uint8_t *data){ } // 14b get and print UID only (general info) -int HF14BStdReader(uint8_t *data, uint8_t *datalen){ +int HF14BStdReader(uint8_t *data, uint8_t *datalen, bool verbose){ //05 00 00 = find one tag in field //1d xx xx xx xx 00 08 01 00 = attrib xx=UID (resp 10 [f9 e0]) //a3 = ? (resp 03 [e2 c2]) @@ -419,9 +423,9 @@ int HF14BStdReader(uint8_t *data, uint8_t *datalen){ data[1] = 0x00; data[2] = 0x08; - if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose(); + if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawCloseEx(verbose); - if (data[0] != 0x50 || *datalen != 14 || !crc) return rawClose(); + if (data[0] != 0x50 || *datalen != 14 || !crc) return rawCloseEx(verbose); PrintAndLog ("\n14443-3b tag found:"); PrintAndLog (" UID: %s", sprint_hex(data+1,4)); @@ -443,18 +447,18 @@ int HF14BStdReader(uint8_t *data, uint8_t *datalen){ cmdLen = 9; // attrib - if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose(); + if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) rawCloseEx(verbose); - if (cmdLen != 3 || !crc2) return rawClose(); + if (cmdLen != 3 || !crc2) return rawCloseEx(verbose); // add attrib responce to data data[14] = cmd2[0]; - rawClose(); + rawCloseEx(verbose); return 1; } // 14b get and print Full Info (as much as we know) -int HF14BStdInfo(uint8_t *data, uint8_t *datalen){ - if (!HF14BStdReader(data,datalen)) return 0; +int HF14BStdInfo(uint8_t *data, uint8_t *datalen, bool verbose){ + if (!HF14BStdReader(data,datalen, verbose)) return 0; //add more info here print_atqb_resp(data); @@ -462,7 +466,7 @@ int HF14BStdInfo(uint8_t *data, uint8_t *datalen){ } // SRx get and print general info about SRx chip from UID -int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){ +int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon, bool verbose){ bool crc = true; *datalen = 2; //wake cmd @@ -471,7 +475,7 @@ int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){ //leave power on // verbose on for now for testing - turn off when functional - if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose(); + if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawCloseEx(verbose); if (*datalen != 3 || !crc) return rawClose(); @@ -482,40 +486,42 @@ int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){ *datalen = 2; //leave power on - if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose(); + if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawCloseEx(verbose); - if (*datalen != 3 || !crc || data[0] != chipID) return rawClose(); + if (*datalen != 3 || !crc || data[0] != chipID) return rawCloseEx(verbose); // get uid data[0] = 0x0B; *datalen = 1; //leave power on - if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose(); + if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawCloseEx(verbose); - if (*datalen != 10 || !crc) return rawClose(); + if (*datalen != 10 || !crc) return rawCloseEx(verbose); //power off ? - if (closeCon) rawClose(); + if (closeCon) rawCloseEx(verbose); - PrintAndLog("\n14443-3b ST tag found:"); - print_st_general_info(data); + if (verbose ) { + PrintAndLog("\n14443-3b ST tag found:"); + print_st_general_info(data); + } return 1; } // SRx get and print full info (needs more info...) -int HF14B_ST_Info(uint8_t *data, uint8_t *datalen){ - if (!HF14B_ST_Reader(data, datalen, false)) return 0; +int HF14B_ST_Info(uint8_t *data, uint8_t *datalen, bool verbose){ + if (!HF14B_ST_Reader(data, datalen, false, verbose)) return 0; //add locking bit information here. if (print_ST_Lock_info(data[5]>>2)) - rawClose(); + rawCloseEx(verbose); return 1; } // test for other 14b type tags (mimic another reader - don't have tags to identify) -int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){ +int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen, bool verbose){ bool crc = true; *datalen = 4; //std read cmd @@ -529,7 +535,7 @@ int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){ PrintAndLog ("\n14443-3b tag found:"); PrintAndLog ("Unknown tag type answered to a 0x000b3f80 command ans:"); PrintAndLog ("%s",sprint_hex(data,*datalen)); - rawClose(); + rawCloseEx(verbose); return 1; } } @@ -543,7 +549,7 @@ int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){ PrintAndLog ("\n14443-3b tag found:"); PrintAndLog ("Unknown tag type answered to a 0x0A command ans:"); PrintAndLog ("%s",sprint_hex(data,*datalen)); - rawClose(); + rawCloseEx(verbose); return 1; } } @@ -557,11 +563,11 @@ int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){ PrintAndLog ("\n14443-3b tag found:"); PrintAndLog ("Unknown tag type answered to a 0x0C command ans:"); PrintAndLog ("%s",sprint_hex(data,*datalen)); - rawClose(); + rawCloseEx(verbose); return 1; } } - rawClose(); + rawCloseEx(verbose); return 0; } @@ -571,14 +577,14 @@ int HF14BInfo(bool verbose){ uint8_t datalen = 5; // try std 14b (atqb) - if (HF14BStdInfo(data, &datalen)) return 1; + if (HF14BStdInfo(data, &datalen, verbose)) return 1; // try st 14b - if (HF14B_ST_Info(data, &datalen)) return 1; + if (HF14B_ST_Info(data, &datalen, verbose)) return 1; // try unknown 14b read commands (to be identified later) // could be read of calypso, CEPAS, moneo, or pico pass. - if (HF14B_Other_Reader(data, &datalen)) return 1; + if (HF14B_Other_Reader(data, &datalen, verbose)) return 1; if (verbose) PrintAndLog("no 14443B tag found"); return 0; @@ -595,14 +601,14 @@ int HF14BReader(bool verbose){ uint8_t datalen = 5; // try std 14b (atqb) - if (HF14BStdReader(data, &datalen)) return 1; + if (HF14BStdReader(data, &datalen, verbose)) return 1; // try st 14b - if (HF14B_ST_Reader(data, &datalen, true)) return 1; + if (HF14B_ST_Reader(data, &datalen, true, verbose)) return 1; // try unknown 14b read commands (to be identified later) // could be read of calypso, CEPAS, moneo, or pico pass. - if (HF14B_Other_Reader(data, &datalen)) return 1; + if (HF14B_Other_Reader(data, &datalen, verbose)) return 1; if (verbose) PrintAndLog("no 14443B tag found"); return 0; @@ -680,53 +686,38 @@ int CmdSriWrite( const char *Cmd){ return 0; } -int srix4kChecksum(uint32_t value) { +uint32_t srix4kEncode(uint32_t value) { /* // vv = value // pp = position // vv vv vv pp 4 bytes : 00 1A 20 01 */ - -#define NibbleHigh(b) ( (b & 0xF0) >> 4 ) -#define NibbleLow(b) ( b & 0x0F ) -#define Crumb(b,p) (((b & (0x3 << p) ) >> p ) & 0xF) - // only the lower crumbs. uint8_t block = (value & 0xFF); uint8_t i = 0; uint8_t valuebytes[] = {0,0,0}; - // if ( strlen(Cmd) > 0){ - // value = param_get32ex(Cmd, 0, 0, 16); - - // block = value & 0xFF; - - // value &= 0xFFFFFF00; - // value >>=8; - // } - num_to_bytes(value, 3, valuebytes); // Scrambled part // Crumb swapping of value. uint8_t temp[] = {0,0}; - temp[0] = (Crumb(value, 22) << 4 | Crumb(value, 14 ) << 2 | Crumb(value, 6)) << 4; - temp[0] |= Crumb(value, 20) << 4 | Crumb(value, 12 ) << 2 | Crumb(value, 4); - temp[1] = (Crumb(value, 18) << 4 | Crumb(value, 10 ) << 2 | Crumb(value, 2)) << 4; - temp[1] |= Crumb(value, 16) << 4 | Crumb(value, 8 ) << 2 | Crumb(value, 0); + temp[0] = (CRUMB(value, 22) << 4 | CRUMB(value, 14 ) << 2 | CRUMB(value, 6)) << 4; + temp[0] |= CRUMB(value, 20) << 4 | CRUMB(value, 12 ) << 2 | CRUMB(value, 4); + temp[1] = (CRUMB(value, 18) << 4 | CRUMB(value, 10 ) << 2 | CRUMB(value, 2)) << 4; + temp[1] |= CRUMB(value, 16) << 4 | CRUMB(value, 8 ) << 2 | CRUMB(value, 0); // chksum part uint32_t chksum = 0xFF - block; // chksum is reduced by each nibbles of value. for (i = 0; i < 3; ++i){ - chksum -= NibbleHigh(valuebytes[i]); - chksum -= NibbleLow(valuebytes[i]); + chksum -= NIBBLE_HIGH(valuebytes[i]); + chksum -= NIBBLE_LOW(valuebytes[i]); } - // base4 conversion - // and left shift twice + // base4 conversion and left shift twice i = 3; uint8_t base4[] = {0,0,0,0}; while( chksum !=0 ){ @@ -736,30 +727,101 @@ int srix4kChecksum(uint32_t value) { // merge scambled and chksum parts uint32_t encvalue = - ( NibbleLow ( base4[0]) << 28 ) | - ( NibbleHigh( temp[0]) << 24 ) | + ( NIBBLE_LOW ( base4[0]) << 28 ) | + ( NIBBLE_HIGH( temp[0]) << 24 ) | - ( NibbleLow ( base4[1]) << 20 ) | - ( NibbleLow ( temp[0]) << 16 ) | + ( NIBBLE_LOW ( base4[1]) << 20 ) | + ( NIBBLE_LOW ( temp[0]) << 16 ) | - ( NibbleLow ( base4[2]) << 12 ) | - ( NibbleHigh( temp[1]) << 8 ) | + ( NIBBLE_LOW ( base4[2]) << 12 ) | + ( NIBBLE_HIGH( temp[1]) << 8 ) | - ( NibbleLow ( base4[3]) << 4 ) | - NibbleLow ( temp[1] ); + ( NIBBLE_LOW ( base4[3]) << 4 ) | + NIBBLE_LOW ( temp[1] ); - PrintAndLog("ICE | %08X", encvalue); + PrintAndLog("ICE encoded | %08X -> %08X", value, encvalue); + return encvalue; +} +uint32_t srix4kDecode(uint32_t value) { + switch(value) { + case 0xC04F42C5: return 0x003139; + case 0xC1484807: return 0x002943; + case 0xC0C60848: return 0x001A20; + } return 0; } -int srix4kMagicbytes(){ +uint32_t srix4kDecodeCounter(uint32_t num) { + uint32_t value = ~num; + ++value; + return value; +} + +uint32_t srix4kGetMagicbytes( uint64_t uid, uint32_t block6, uint32_t block18, uint32_t block19 ){ +#define MASK 0xFFFFFFFF; + uint32_t uid32 = uid & MASK; + uint32_t counter = srix4kDecodeCounter(block6); + uint32_t decodedBlock18 = srix4kDecode(block18); + uint32_t decodedBlock19 = srix4kDecode(block19); + uint32_t doubleBlock = (decodedBlock18 << 16 | decodedBlock19) + 1; + + uint32_t result = (uid32 * doubleBlock * counter) & MASK; + PrintAndLog("Magic bytes | %08X", result); + return result; +} +int srix4kValid(const char *Cmd){ + + uint64_t uid = 0xD00202501A4532F9; + uint32_t block6 = 0xFFFFFFFF; + uint32_t block18 = 0xC04F42C5; + uint32_t block19 = 0xC1484807; + uint32_t block21 = 0xD1BCABA4; + + uint32_t test_b18 = 0x00313918; + uint32_t test_b18_enc = srix4kEncode(test_b18); + //uint32_t test_b18_dec = srix4kDecode(test_b18_enc); + PrintAndLog("ENCODE & CHECKSUM | %08X -> %08X (%s)", test_b18, test_b18_enc , ""); + + uint32_t magic = srix4kGetMagicbytes(uid, block6, block18, block19); + PrintAndLog("BLOCK 21 | %08X -> %08X (no XOR)", block21, magic ^ block21); return 0; } -int srix4kValid(){ + +int CmdteaSelfTest(const char *Cmd){ + + uint8_t v[8], v_le[8]; + memset(v, 0x00, sizeof(v)); + memset(v_le, 0x00, sizeof(v_le)); + uint8_t* v_ptr = v_le; + + uint8_t cmdlen = strlen(Cmd); + cmdlen = ( sizeof(v)<<2 < cmdlen ) ? sizeof(v)<<2 : cmdlen; + + if ( param_gethex(Cmd, 0, v, cmdlen) > 0 ){ + PrintAndLog("can't read hex chars, uneven? :: %u", cmdlen); + return 1; + } + + SwapEndian64ex(v , 8, 4, v_ptr); + + // ENCRYPTION KEY: + uint8_t key[16] = {0x55,0xFE,0xF6,0x30,0x62,0xBF,0x0B,0xC1,0xC9,0xB3,0x7C,0x34,0x97,0x3E,0x29,0xFB }; + uint8_t keyle[16]; + uint8_t* key_ptr = keyle; + SwapEndian64ex(key , sizeof(key), 4, key_ptr); + + PrintAndLog("TEST LE enc| %s", sprint_hex(v_ptr, 8)); + + tea_decrypt(v_ptr, key_ptr); + PrintAndLog("TEST LE dec | %s", sprint_hex_ascii(v_ptr, 8)); + + tea_encrypt(v_ptr, key_ptr); + tea_encrypt(v_ptr, key_ptr); + PrintAndLog("TEST enc2 | %s", sprint_hex_ascii(v_ptr, 8)); + return 0; } -static command_t CommandTable[] = -{ +static command_t CommandTable[] = { {"help", CmdHelp, 1, "This help"}, {"info", CmdHF14Binfo, 0, "Find and print details about a 14443B tag"}, {"list", CmdHF14BList, 0, "[Deprecated] List ISO 14443B history"}, @@ -770,18 +832,18 @@ static command_t CommandTable[] = {"srix4kread", CmdSrix4kRead, 0, "Read contents of a SRIX4K tag"}, {"sriwrite", CmdSriWrite, 0, "Write data to a SRI512 | SRIX4K tag"}, {"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"}, - //{"calcSrix4", srix4kchksum, 1, "a srix4k checksum test"}, + //{"valid", srix4kValid, 1, "srix4k checksum test"}, + {"valid", CmdteaSelfTest, 1, "tea test"}, {NULL, NULL, 0, NULL} }; -int CmdHF14B(const char *Cmd) -{ +int CmdHF14B(const char *Cmd) { + clearCommandBuffer(); CmdsParse(CommandTable, Cmd); return 0; } -int CmdHelp(const char *Cmd) -{ +int CmdHelp(const char *Cmd) { CmdsHelp(CommandTable); return 0; }