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

deleted client call of reset function

Browse source
This commit is contained in:
tharexde 2020-12-03 20:47:01 +01:00
commit 6448ade0f2
7 changed files with 0 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
armsrc/appmain.c
View file

@ -1122,10 +1122,6 @@ static void PacketReceived(PacketCommandNG *packet) {
em4x50_login((uint32_t *)packet->data.asBytes); em4x50_login((uint32_t *)packet->data.asBytes);
break; break;
} }
case CMD_LF_EM4X50_RESET: {
em4x50_reset();
break;
}
case CMD_LF_EM4X50_RESTORE: { case CMD_LF_EM4X50_RESTORE: {
em4x50_restore((em4x50_data_t *)packet->data.asBytes); em4x50_restore((em4x50_data_t *)packet->data.asBytes);
break; break;

16
armsrc/em4x50.c
View file

@ -1005,22 +1005,6 @@ static int reset(void) {
return PM3_EFAILED; return PM3_EFAILED;
} }
void em4x50_reset(void) {
// reset EM4x50
uint8_t status = PM3_EFAILED;
em4x50_setup_read();
// set gHigh and gLow
if (get_signalproperties() && find_em4x50_tag())
status = reset();
lf_finalize();
reply_ng(CMD_LF_EM4X50_RESET, status, 0, 0);
}
//============================================================================== //==============================================================================
// read functions // read functions
//============================================================================== //==============================================================================

2
armsrc/em4x50.h
View file

@ -18,14 +18,12 @@ int em4x50_standalone_brute(uint32_t start, uint32_t stop, uint32_t *pwd);
bool em4x50_sim_send_listen_window(void); bool em4x50_sim_send_listen_window(void);
bool em4x50_sim_send_word(uint32_t word); bool em4x50_sim_send_word(uint32_t word);
void em4x50_info(em4x50_data_t *etd); void em4x50_info(em4x50_data_t *etd);
void em4x50_write(em4x50_data_t *etd); void em4x50_write(em4x50_data_t *etd);
void em4x50_writepwd(em4x50_data_t *etd); void em4x50_writepwd(em4x50_data_t *etd);
void em4x50_read(em4x50_data_t *etd); void em4x50_read(em4x50_data_t *etd);
void em4x50_brute(em4x50_data_t *etd); void em4x50_brute(em4x50_data_t *etd);
void em4x50_login(uint32_t *password); void em4x50_login(uint32_t *password);
void em4x50_reset(void);
void em4x50_restore(em4x50_data_t *etd); void em4x50_restore(em4x50_data_t *etd);
void em4x50_sim(void); void em4x50_sim(void);
void em4x50_reader(void); void em4x50_reader(void);

1
client/src/cmdlfem4x.c
View file

@ -660,7 +660,6 @@ static command_t CommandTable[] = {
{"4x50_wipe", CmdEM4x50Wipe, IfPm3EM4x50, "wipe EM4x50 tag"}, {"4x50_wipe", CmdEM4x50Wipe, IfPm3EM4x50, "wipe EM4x50 tag"},
{"4x50_brute", CmdEM4x50Brute, IfPm3EM4x50, "guess password of EM4x50"}, {"4x50_brute", CmdEM4x50Brute, IfPm3EM4x50, "guess password of EM4x50"},
{"4x50_login", CmdEM4x50Login, IfPm3EM4x50, "login into EM4x50"}, {"4x50_login", CmdEM4x50Login, IfPm3EM4x50, "login into EM4x50"},
{"4x50_reset", CmdEM4x50Reset, IfPm3EM4x50, "reset EM4x50"},
{"4x50_restore",CmdEM4x50Restore, IfPm3EM4x50, "restore EM4x50 dump to tag"}, {"4x50_restore",CmdEM4x50Restore, IfPm3EM4x50, "restore EM4x50 dump to tag"},
{"4x50_sim", CmdEM4x50Sim, IfPm3EM4x50, "simulate EM4x50 tag"}, {"4x50_sim", CmdEM4x50Sim, IfPm3EM4x50, "simulate EM4x50 tag"},
{"4x50_reader", CmdEM4x50Reader, IfPm3EM4x50, "show standard read mode data of EM4x50"}, {"4x50_reader", CmdEM4x50Reader, IfPm3EM4x50, "show standard read mode data of EM4x50"},

36
client/src/cmdlfem4x50.c
View file

@ -562,42 +562,6 @@ int CmdEM4x50Chk(const char *Cmd) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
//==============================================================================
// reset functions
//==============================================================================
int CmdEM4x50Reset(const char *Cmd) {
PacketResponseNG resp;
CLIParserContext *ctx;
CLIParserInit(&ctx, "lf em 4x50_reset",
"Reseta EM4x50 tag.",
"lf em 4x50_reset\n"
);
void *argtable[] = {
arg_param_begin,
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
CLIParserFree(ctx);
// start
clearCommandBuffer();
SendCommandNG(CMD_LF_EM4X50_RESET, 0, 0);
WaitForResponse(CMD_LF_EM4X50_RESET, &resp);
// print response
if (resp.status == PM3_SUCCESS)
PrintAndLogEx(SUCCESS, "Reset " _GREEN_("ok"));
else
PrintAndLogEx(FAILED, "Reset " _RED_("failed"));
return resp.status;
}
//============================================================================== //==============================================================================
// read functions // read functions
//============================================================================== //==============================================================================

1
client/src/cmdlfem4x50.h
View file

@ -25,7 +25,6 @@ int CmdEM4x50Dump(const char *Cmd);
int CmdEM4x50Wipe(const char *Cmd); int CmdEM4x50Wipe(const char *Cmd);
int CmdEM4x50Brute(const char *Cmd); int CmdEM4x50Brute(const char *Cmd);
int CmdEM4x50Login(const char *Cmd); int CmdEM4x50Login(const char *Cmd);
int CmdEM4x50Reset(const char *Cmd);
int CmdEM4x50Restore(const char *Cmd); int CmdEM4x50Restore(const char *Cmd);
int CmdEM4x50Sim(const char *Cmd); int CmdEM4x50Sim(const char *Cmd);
int CmdEM4x50Reader(const char *Cmd); int CmdEM4x50Reader(const char *Cmd);

1
include/pm3_cmd.h
View file

@ -511,7 +511,6 @@ typedef struct {
#define CMD_LF_EM4X50_READ 0x0243 #define CMD_LF_EM4X50_READ 0x0243
#define CMD_LF_EM4X50_BRUTE 0x0245 #define CMD_LF_EM4X50_BRUTE 0x0245
#define CMD_LF_EM4X50_LOGIN 0x0246 #define CMD_LF_EM4X50_LOGIN 0x0246
#define CMD_LF_EM4X50_RESET 0x0247
#define CMD_LF_EM4X50_RESTORE 0x0249 #define CMD_LF_EM4X50_RESTORE 0x0249
#define CMD_LF_EM4X50_SIM 0x0250 #define CMD_LF_EM4X50_SIM 0x0250
#define CMD_LF_EM4X50_READER 0x0251 #define CMD_LF_EM4X50_READER 0x0251