github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 06:13:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

adjustments regarding em4x50 (hopefully it works...)

Browse source
This commit is contained in:
tharexde 2020-10-26 22:14:18 +01:00
commit eee2540e85
1 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/src/scripting.c
View file

@ -1131,7 +1131,6 @@ static int l_em4x05_read(lua_State *L) {
} }
// 4350 // 4350
/*
static int l_em4x50_read(lua_State *L) { static int l_em4x50_read(lua_State *L) {
// get addr // get addr
@ -1147,8 +1146,7 @@ static int l_em4x50_read(lua_State *L) {
em4x50_data_t etd; em4x50_data_t etd;
memset(&etd, 0x00, sizeof(em4x50_data_t)); memset(&etd, 0x00, sizeof(em4x50_data_t));
etd.addr_given = true; etd.addr_given = true;
etd.address = addr & 0xFF; etd.addresses = addr & 0xFF;
etd.newpwd_given = false;
// get password // get password
const char *p_pwd = luaL_checkstring(L, 2); const char *p_pwd = luaL_checkstring(L, 2);
@ -1163,16 +1161,13 @@ static int l_em4x50_read(lua_State *L) {
PrintAndLogEx(DEBUG, " Pwd %08X", pwd); PrintAndLogEx(DEBUG, " Pwd %08X", pwd);
etd.password[0] = pwd & 0xFF; etd.password1 = pwd;
etd.password[1] = (pwd >> 8) & 0xFF;
etd.password[2] = (pwd >> 16) & 0xFF;
etd.password[3] = (pwd >> 24) & 0xFF;
etd.pwd_given = true; etd.pwd_given = true;
} }
PrintAndLogEx(DEBUG, "Addr %u", etd.address); PrintAndLogEx(DEBUG, "Addr %u", etd.addresses & 0xFF);
if (etd.pwd_given) if (etd.pwd_given)
PrintAndLogEx(DEBUG, " Pwd %s", sprint_hex(etd.password, sizeof(etd.password))); PrintAndLogEx(DEBUG, " Pwd %08x", etd.password1);
em4x50_word_t words[EM4X50_NO_WORDS]; em4x50_word_t words[EM4X50_NO_WORDS];
@ -1182,15 +1177,16 @@ static int l_em4x50_read(lua_State *L) {
} }
uint32_t word = ( uint32_t word = (
words[etd.address].byte[0] << 24 | words[etd.addresses & 0xFF].byte[0] << 24 |
words[etd.address].byte[1] << 16 | words[etd.addresses & 0xFF].byte[1] << 16 |
words[etd.address].byte[2] << 8 | words[etd.addresses & 0xFF].byte[2] << 8 |
words[etd.address].byte[3] words[etd.addresses & 0xFF].byte[3]
); );
lua_pushinteger(L, word); lua_pushinteger(L, word);
return 1; return 1;
} }
*/
// //
static int l_ndefparse(lua_State *L) { static int l_ndefparse(lua_State *L) {
@ -1383,7 +1379,7 @@ int set_pm3_libraries(lua_State *L) {
{"ud", l_ud}, {"ud", l_ud},
{"rem", l_remark}, {"rem", l_remark},
{"em4x05_read", l_em4x05_read}, {"em4x05_read", l_em4x05_read},
// {"em4x50_read", l_em4x50_read}, {"em4x50_read", l_em4x50_read},
{NULL, NULL} {NULL, NULL}
}; };