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

Merge branch 'master' of github.com:RfidResearchGroup/proxmark3

Browse source
This commit is contained in:
iceman1001 2024-09-14 21:05:19 +02:00
commit d1029ce281
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/src/cmdlfem410x.c
View file

@ -108,8 +108,6 @@ static void em410x_construct_emul_graph(uint8_t *uid, uint8_t clock, uint8_t gap
// print 64 bit EM410x ID in multiple formats // print 64 bit EM410x ID in multiple formats
void printEM410x(uint32_t hi, uint64_t id, bool verbose, int type) { void printEM410x(uint32_t hi, uint64_t id, bool verbose, int type) {
if (!id && !hi) return;
if (verbose == false) { if (verbose == false) {
if (type & 0x1) { // Short ID if (type & 0x1) { // Short ID
PrintAndLogEx(SUCCESS, "EM 410x ID "_GREEN_("%010" PRIX64), id); PrintAndLogEx(SUCCESS, "EM 410x ID "_GREEN_("%010" PRIX64), id);
@ -254,11 +252,6 @@ static int ask_em410x_binary_decode(bool verbose, uint32_t *hi, uint64_t *lo, ui
return PM3_ESOFT; return PM3_ESOFT;
} }
if (!lo && !hi) {
PrintAndLogEx(DEBUG, "DEBUG: Error - Em410x decoded to all zeros");
return PM3_ESOFT;
}
PrintAndLogEx(DEBUG, "DEBUG: Em410x idx: %zu, Len: %zu, Printing DemodBuffer:", *idx, *size); PrintAndLogEx(DEBUG, "DEBUG: Em410x idx: %zu, Len: %zu, Printing DemodBuffer:", *idx, *size);
if (g_debugMode) { if (g_debugMode) {
printDemodBuff(0, false, false, true); printDemodBuff(0, false, false, true);
@ -680,7 +673,7 @@ static int CmdEM410xClone(const char *Cmd) {
"lf em 410x clone --id 0F0368568B -> encode for T55x7 tag\n" "lf em 410x clone --id 0F0368568B -> encode for T55x7 tag\n"
"lf em 410x clone --id 0F0368568B --q5 -> encode for Q5/T5555 tag\n" "lf em 410x clone --id 0F0368568B --q5 -> encode for Q5/T5555 tag\n"
"lf em 410x clone --id 0F0368568B --em -> encode for EM4305/4469\n" "lf em 410x clone --id 0F0368568B --em -> encode for EM4305/4469\n"
"lf em 410x clone --id 0F0368568B --hts -> encode for Hitag S/8211/8268/8310" "lf em 410x clone --id 0F0368568B --hts -> encode for Hitag S/8211/8268/8310"
); );
void *argtable[] = { void *argtable[] = {