github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-07-16 10:03:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up

Browse source
This commit is contained in:
iceman1001 2023-10-02 21:39:15 +02:00
parent e94a653038
commit 010668ebb1
6 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
armsrc/Standalone/hf_iceclass.c
View file

@ -69,7 +69,6 @@
#define HF_ICALSSS_READSIM_TEMP_MOD_BIN "iceclass-temp-mod.bin" #define HF_ICALSSS_READSIM_TEMP_MOD_BIN "iceclass-temp-mod.bin"
#define HF_ICLASS_FULLSIM_MOD "iceclass-modified" #define HF_ICLASS_FULLSIM_MOD "iceclass-modified"
#define HF_ICLASS_FULLSIM_MOD_BIN HF_ICLASS_FULLSIM_MOD".bin" #define HF_ICLASS_FULLSIM_MOD_BIN HF_ICLASS_FULLSIM_MOD".bin"
#define HF_ICLASS_FULLSIM_MOD_EML HF_ICLASS_FULLSIM_MOD".eml"
#define HF_ICLASS_ATTACK_BIN "iclass_mac_attack" #define HF_ICLASS_ATTACK_BIN "iclass_mac_attack"
#define HF_ICLASS_CC_A "iceclass_cc_a.bin" #define HF_ICLASS_CC_A "iceclass_cc_a.bin"

4
armsrc/iso15693.c
View file

@ -1060,7 +1060,7 @@ int GetIso15693AnswerFromTag(uint8_t *response, uint16_t max_len, uint16_t timeo
if (dtf->len > dtf->max_len) { if (dtf->len > dtf->max_len) {
ret = PM3_EOVFLOW; ret = PM3_EOVFLOW;
Dbprintf("overflow (%d > %d", dtf->len, dtf->max_len); Dbprintf("overflow (%d > %d)", dtf->len, dtf->max_len);
} }
break; break;
} }
@ -1083,7 +1083,7 @@ int GetIso15693AnswerFromTag(uint8_t *response, uint16_t max_len, uint16_t timeo
if (dt->len > dt->max_len) { if (dt->len > dt->max_len) {
ret = PM3_EOVFLOW; ret = PM3_EOVFLOW;
Dbprintf("overflow (%d > %d", dt->len, dt->max_len); Dbprintf("overflow (%d > %d)", dt->len, dt->max_len);
} }
break; break;
} }

4
client/gen_pm3mfsim_script.sh
View file

@ -30,6 +30,6 @@ fi
rm $2 rm $2
echo "hf mf eclr" >> $2 echo "hf mf eclr" >> $2
echo "hf mf eload" $1 >> $2 echo "hf mf eload -f " $1 >> $2
echo "hf mf ekeyprn" >> $2 echo "hf mf ekeyprn" >> $2
echo "hf mf sim -u" `cat $1.eml | (read -n 8 uid; echo $uid)` >> $2 echo "hf mf sim --1k -u" `cat $1.eml | (read -n 8 uid; echo $uid)` >> $2

6
client/luascripts/hf_mf_tnp3_sim.lua
View file

@ -87,12 +87,6 @@ local function ExitMsg(msg)
print() print()
end end
local function writedumpfile(infile)
t = infile:read('*all')
len = string.len(t)
local len,hex = bin.unpack(('H%d'):format(len),t)
return hex
end
-- blocks with data -- blocks with data
-- there are two dataareas, in block 8 or block 36, ( 1==8 , -- there are two dataareas, in block 8 or block 36, ( 1==8 ,
-- checksum type = 0, 1, 2, 3 -- checksum type = 0, 1, 2, 3

2
client/src/cmdhf15.c
View file

@ -1249,7 +1249,7 @@ static int CmdHF15EView(const char *Cmd) {
} }
PrintAndLogEx(INFO, "Downloading %u bytes from emulator memory", bytes); PrintAndLogEx(INFO, "Downloading %u bytes from emulator memory", bytes);
if (!GetFromDevice(BIG_BUF_EML, dump, bytes, 0, NULL, 0, NULL, 2500, false)) { if (GetFromDevice(BIG_BUF_EML, dump, bytes, 0, NULL, 0, NULL, 2500, false) == false) {
PrintAndLogEx(WARNING, "Fail, transfer from device time-out"); PrintAndLogEx(WARNING, "Fail, transfer from device time-out");
free(dump); free(dump);
return PM3_ETIMEOUT; return PM3_ETIMEOUT;

4
client/src/cmdlf.c
View file

@ -1,4 +1,4 @@
//----------------------------------------------------------------------------- // //-----------------------------------------------------------------------------
// Copyright (C) Proxmark3 contributors. See AUTHORS.md for details. // Copyright (C) Proxmark3 contributors. See AUTHORS.md for details.
// //
// This program is free software: you can redistribute it and/or modify // This program is free software: you can redistribute it and/or modify
@ -469,7 +469,7 @@ int CmdFlexdemod(const char *Cmd) {
sum += data[i++]; sum += data[i++];
} }
bits[bit] = (sum > 0) ? 1 : 0; bits[bit] = (sum > 0) ? 1 : 0;
PrintAndLogEx(NORMAL, "bit %d sum %d", bit, sum); // PrintAndLogEx(NORMAL, "bit %d sum %d", bit, sum);
} }
for (bit = 0; bit < 64; bit++) { for (bit = 0; bit < 64; bit++) {