github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

CHG: some of @marshmellow42 's ref: 2b11c7c750

Browse source 
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.
This commit is contained in:
iceman1001 2017-02-27 14:04:50 +01:00
commit 41611deef9
4 changed files with 125 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

17
client/cmddata.c
View file

@ -364,7 +364,10 @@ int CmdGetBitStream(const char *Cmd)
//print 64 bit EM410x ID in multiple formats
void printEM410x(uint32_t hi, uint64_t id)
{
if (id || hi){
//if (!id && !hi) return;
PrintAndLog("EM410x %s pattern found", (hi) ? "XL" : "" );
uint64_t iii=1;
uint64_t id2lo=0;
uint32_t ii=0;
@ -374,6 +377,7 @@ void printEM410x(uint32_t hi, uint64_t id)
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);
@ -453,7 +457,6 @@ void printEM410x(uint32_t hi, uint64_t id)
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,6 +480,10 @@ 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);
@ -484,10 +491,10 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
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;
}

1
client/cmdhf14a.c
View file

@ -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
};

22
client/cmdlf.c
View file

@ -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) ) {

35
client/cmdlfem4x.c
View file

@ -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] <uid> <clock>");
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] <uid> <clock>");
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;