From 41611deef90f78c2ee5d20d78e9bd1c7f64d964b Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Mon, 27 Feb 2017 14:04:50 +0100 Subject: [PATCH] CHG: some of @marshmellow42 's ref: https://github.com/marshmellow42/proxmark3/commit/2b11c7c75068f6e25da5cc4ed463ff78b2cc8900 CHG: `lf em 410x` - when demoded to all zeros, it wasn't printed so some noninitalized tags just gets a empty "found em410x tag" message. Hav'nt decided on how to go further with it. --- client/cmddata.c | 189 +++++++++++++++++++++++---------------------- client/cmdhf14a.c | 1 + client/cmdlf.c | 22 +++--- client/cmdlfem4x.c | 35 ++++----- 4 files changed, 126 insertions(+), 121 deletions(-) diff --git a/client/cmddata.c b/client/cmddata.c index 9e7fc8ed..74973b34 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -364,95 +364,98 @@ int CmdGetBitStream(const char *Cmd) //print 64 bit EM410x ID in multiple formats void printEM410x(uint32_t hi, uint64_t id) { - if (id || hi){ - uint64_t iii=1; - uint64_t id2lo=0; - uint32_t ii=0; - uint32_t i=0; - for (ii=5; ii>0;ii--){ - for (i=0;i<8;i++){ - id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8))); - } + //if (!id && !hi) return; + + PrintAndLog("EM410x %s pattern found", (hi) ? "XL" : "" ); + + uint64_t iii=1; + uint64_t id2lo=0; + uint32_t ii=0; + uint32_t i=0; + for (ii=5; ii>0;ii--){ + for (i=0;i<8;i++){ + id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8))); } - if (hi){ - //output 88 bit em id - PrintAndLog("\nEM TAG ID : %06X%016" PRIX64, hi, id); - } else{ - //output 40 bit em id - PrintAndLog("\nEM TAG ID : %010" PRIX64, id); - PrintAndLog("\nPossible de-scramble patterns"); - PrintAndLog("Unique TAG ID : %010" PRIX64, id2lo); - PrintAndLog("HoneyWell IdentKey {"); - PrintAndLog("DEZ 8 : %08" PRIu64, id & 0xFFFFFF); - PrintAndLog("DEZ 10 : %010" PRIu64, id & 0xFFFFFFFF); - PrintAndLog("DEZ 5.5 : %05" PRIu64 ".%05" PRIu64, (id>>16LL) & 0xFFFF, (id & 0xFFFF)); - PrintAndLog("DEZ 3.5A : %03" PRIu64 ".%05" PRIu64, (id>>32ll), (id & 0xFFFF)); - PrintAndLog("DEZ 3.5B : %03" PRIu64 ".%05" PRIu64, (id & 0xFF000000) >> 24, (id & 0xFFFF)); - PrintAndLog("DEZ 3.5C : %03" PRIu64 ".%05" PRIu64, (id & 0xFF0000) >> 16, (id & 0xFFFF)); - PrintAndLog("DEZ 14/IK2 : %014" PRIu64, id); - PrintAndLog("DEZ 15/IK3 : %015" PRIu64, id2lo); - PrintAndLog("DEZ 20/ZK : %02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64, - (id2lo & 0xf000000000) >> 36, - (id2lo & 0x0f00000000) >> 32, - (id2lo & 0x00f0000000) >> 28, - (id2lo & 0x000f000000) >> 24, - (id2lo & 0x0000f00000) >> 20, - (id2lo & 0x00000f0000) >> 16, - (id2lo & 0x000000f000) >> 12, - (id2lo & 0x0000000f00) >> 8, - (id2lo & 0x00000000f0) >> 4, - (id2lo & 0x000000000f) - ); - uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff)) + 0x143e00; - PrintAndLog("}\nOther : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64, (id&0xFFFF), ((id>>16LL) & 0xFF), (id & 0xFFFFFF)); - PrintAndLog("Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton); - - uint32_t p1id = (id & 0xFFFFFF); - uint8_t arr[32] = {0x00}; - int i =0; - int j = 23; - for (; i < 24; ++i, --j ){ - arr[i] = (p1id >> i) & 1; - } - - uint32_t p1 = 0; - - p1 |= arr[23] << 21; - p1 |= arr[22] << 23; - p1 |= arr[21] << 20; - p1 |= arr[20] << 22; - - p1 |= arr[19] << 18; - p1 |= arr[18] << 16; - p1 |= arr[17] << 19; - p1 |= arr[16] << 17; - - p1 |= arr[15] << 13; - p1 |= arr[14] << 15; - p1 |= arr[13] << 12; - p1 |= arr[12] << 14; - - p1 |= arr[11] << 6; - p1 |= arr[10] << 2; - p1 |= arr[9] << 7; - p1 |= arr[8] << 1; - - p1 |= arr[7] << 0; - p1 |= arr[6] << 8; - p1 |= arr[5] << 11; - p1 |= arr[4] << 3; - - p1 |= arr[3] << 10; - p1 |= arr[2] << 4; - p1 |= arr[1] << 5; - p1 |= arr[0] << 9; - PrintAndLog("Pattern 1 : %d [0x%X]", p1, p1); - - uint16_t sebury1 = id & 0xFFFF; - uint8_t sebury2 = (id >> 16) & 0x7F; - uint32_t sebury3 = id & 0x7FFFFF; - PrintAndLog("Pattern Sebury : %d %d %d [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3); + } + + if (hi){ + //output 88 bit em id + PrintAndLog("\nEM TAG ID : %06X%016" PRIX64, hi, id); + } else{ + //output 40 bit em id + PrintAndLog("\nEM TAG ID : %010" PRIX64, id); + PrintAndLog("\nPossible de-scramble patterns"); + PrintAndLog("Unique TAG ID : %010" PRIX64, id2lo); + PrintAndLog("HoneyWell IdentKey {"); + PrintAndLog("DEZ 8 : %08" PRIu64, id & 0xFFFFFF); + PrintAndLog("DEZ 10 : %010" PRIu64, id & 0xFFFFFFFF); + PrintAndLog("DEZ 5.5 : %05" PRIu64 ".%05" PRIu64, (id>>16LL) & 0xFFFF, (id & 0xFFFF)); + PrintAndLog("DEZ 3.5A : %03" PRIu64 ".%05" PRIu64, (id>>32ll), (id & 0xFFFF)); + PrintAndLog("DEZ 3.5B : %03" PRIu64 ".%05" PRIu64, (id & 0xFF000000) >> 24, (id & 0xFFFF)); + PrintAndLog("DEZ 3.5C : %03" PRIu64 ".%05" PRIu64, (id & 0xFF0000) >> 16, (id & 0xFFFF)); + PrintAndLog("DEZ 14/IK2 : %014" PRIu64, id); + PrintAndLog("DEZ 15/IK3 : %015" PRIu64, id2lo); + PrintAndLog("DEZ 20/ZK : %02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64, + (id2lo & 0xf000000000) >> 36, + (id2lo & 0x0f00000000) >> 32, + (id2lo & 0x00f0000000) >> 28, + (id2lo & 0x000f000000) >> 24, + (id2lo & 0x0000f00000) >> 20, + (id2lo & 0x00000f0000) >> 16, + (id2lo & 0x000000f000) >> 12, + (id2lo & 0x0000000f00) >> 8, + (id2lo & 0x00000000f0) >> 4, + (id2lo & 0x000000000f) + ); + uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff)) + 0x143e00; + PrintAndLog("}\nOther : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64, (id&0xFFFF), ((id>>16LL) & 0xFF), (id & 0xFFFFFF)); + PrintAndLog("Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton); + + uint32_t p1id = (id & 0xFFFFFF); + uint8_t arr[32] = {0x00}; + int i =0; + int j = 23; + for (; i < 24; ++i, --j ){ + arr[i] = (p1id >> i) & 1; } + + uint32_t p1 = 0; + + p1 |= arr[23] << 21; + p1 |= arr[22] << 23; + p1 |= arr[21] << 20; + p1 |= arr[20] << 22; + + p1 |= arr[19] << 18; + p1 |= arr[18] << 16; + p1 |= arr[17] << 19; + p1 |= arr[16] << 17; + + p1 |= arr[15] << 13; + p1 |= arr[14] << 15; + p1 |= arr[13] << 12; + p1 |= arr[12] << 14; + + p1 |= arr[11] << 6; + p1 |= arr[10] << 2; + p1 |= arr[9] << 7; + p1 |= arr[8] << 1; + + p1 |= arr[7] << 0; + p1 |= arr[6] << 8; + p1 |= arr[5] << 11; + p1 |= arr[4] << 3; + + p1 |= arr[3] << 10; + p1 |= arr[2] << 4; + p1 |= arr[1] << 5; + p1 |= arr[0] << 9; + PrintAndLog("Pattern 1 : %d [0x%X]", p1, p1); + + uint16_t sebury1 = id & 0xFFFF; + uint8_t sebury2 = (id >> 16) & 0x7F; + uint32_t sebury3 = id & 0x7FFFFF; + PrintAndLog("Pattern Sebury : %d %d %d [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3); } return; } @@ -477,17 +480,21 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo ) } return 0; } - + if (!lo && !hi) { + PrintAndLog("DEBUG: Error - Em410x decoded to all zeros"); + return 0; + } + //set GraphBuffer for clone or sim command setDemodBuf(BitStream, size, idx); if (g_debugMode){ PrintAndLog("DEBUG: Em410x idx: %d, Len: %d, Printing Demod Buffer:", idx, size); printDemodBuff(); } - if (verbose){ - PrintAndLog("EM410x pattern found: "); + + if (verbose) printEM410x(*hi, *lo); - } + return 1; } diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c index 6d338d0d..36855c97 100644 --- a/client/cmdhf14a.c +++ b/client/cmdhf14a.c @@ -108,6 +108,7 @@ const manufactureName manufactureMapping[] = { { 0x42, "3Alogics Inc Korea" }, { 0x43, "Top TroniQ Asia Limited Hong Kong" }, { 0x44, "Gentag Inc. USA" }, + { 0x56, "Sensible Object. UK" }, { 0x00, "no tag-info available" } // must be the last entry }; diff --git a/client/cmdlf.c b/client/cmdlf.c index 92352438..8ab065bb 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -8,6 +8,9 @@ // Low frequency commands //----------------------------------------------------------------------------- #include "cmdlf.h" + +bool g_lf_threshold_set = FALSE; + static int CmdHelp(const char *Cmd); int usage_lf_cmdread(void) { @@ -27,11 +30,10 @@ int usage_lf_cmdread(void) { return 0; } int usage_lf_read(void){ - PrintAndLog("Usage: lf read [h] [s] [t]"); + PrintAndLog("Usage: lf read [h] [s]"); PrintAndLog("Options:"); PrintAndLog(" h This help"); PrintAndLog(" s silent run no printout"); - PrintAndLog(" t waits for device to respond with no timeout"); PrintAndLog("Use 'lf config' to set parameters."); return 0; } @@ -503,7 +505,10 @@ int CmdLFSetConfig(const char *Cmd) { case 't': errors |= param_getdec(Cmd, cmdp+1, &unsigned_trigg); cmdp+=2; - if(!errors) trigger_threshold = unsigned_trigg; + if(!errors) { + trigger_threshold = unsigned_trigg; + g_lf_threshold_set = (trigger_threshold > 0); + } break; case 'b': errors |= param_getdec(Cmd, cmdp+1, &bps); @@ -544,9 +549,11 @@ int CmdLFSetConfig(const char *Cmd) { } int CmdLFRead(const char *Cmd) { + + if (offline) return 0; + bool errors = FALSE; bool arg1 = FALSE; - bool thresholdRead = FALSE; uint8_t cmdp = 0; while(param_getchar(Cmd, cmdp) != 0x00) { switch(param_getchar(Cmd, cmdp)) { @@ -558,11 +565,6 @@ int CmdLFRead(const char *Cmd) { arg1 = TRUE; cmdp++; break; - case 't': - case 'T': - thresholdRead = TRUE; - cmdp++; - break; default: PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp)); errors = 1; @@ -580,7 +582,7 @@ int CmdLFRead(const char *Cmd) { UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}}; clearCommandBuffer(); SendCommand(&c); - if ( thresholdRead ) { + if ( g_lf_threshold_set ) { WaitForResponse(CMD_ACK,NULL); } else { if ( !WaitForResponseTimeout(CMD_ACK, NULL ,2500) ) { diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c index 89f68171..ff7a5f69 100644 --- a/client/cmdlfem4x.c +++ b/client/cmdlfem4x.c @@ -14,6 +14,20 @@ uint64_t g_em410xid = 0; static int CmdHelp(const char *Cmd); +int usage_lf_em410x_sim(void) { + PrintAndLog("Simulating EM410x tag"); + PrintAndLog(""); + PrintAndLog("Usage: lf em 410xsim [h] "); + PrintAndLog("Options:"); + PrintAndLog(" h - this help"); + PrintAndLog(" uid - uid (10 HEX symbols)"); + PrintAndLog(" clock - clock (32|64) (optional)"); + PrintAndLog("samples:"); + PrintAndLog(" lf em 410xsim 0F0368568B"); + PrintAndLog(" lf em 410xsim 0F0368568B 32"); + return 0; +} + int CmdEMdemodASK(const char *Cmd) { char cmdp = param_getchar(Cmd, 0); @@ -37,31 +51,12 @@ int CmdEM410xRead(const char *Cmd) uint64_t lo = 0; if(!AskEm410xDemod("", &hi, &lo, false)) return 0; - if (hi) - PrintAndLog ("EM410x XL pattern found"); - else - PrintAndLog("EM410x pattern found: "); printEM410x(hi, lo); g_em410xid = lo; return 1; } - -int usage_lf_em410x_sim(void) { - PrintAndLog("Simulating EM410x tag"); - PrintAndLog(""); - PrintAndLog("Usage: lf em 410xsim [h] "); - PrintAndLog("Options:"); - PrintAndLog(" h - this help"); - PrintAndLog(" uid - uid (10 HEX symbols)"); - PrintAndLog(" clock - clock (32|64) (optional)"); - PrintAndLog("samples:"); - PrintAndLog(" lf em 410xsim 0F0368568B"); - PrintAndLog(" lf em 410xsim 0F0368568B 32"); - return 0; -} - // emulate an EM410X tag int CmdEM410xSim(const char *Cmd) { @@ -889,7 +884,7 @@ int CmdEM4x05Write(const char *Cmd) { PrintAndLog("Address must be between 0 and 15"); return 1; } - if ( pwd == -1 ) + if ( pwd == 1 ) PrintAndLog("Writing address %d data %08X", addr, data); else { usePwd = true; -- 2.39.2