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

added "tearoff"

Browse source
This commit is contained in:
tharexde 2020-10-22 15:07:05 +02:00
commit 243e6934de
1 changed files with 41 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

52
armsrc/em4x50.c
View file

@ -888,7 +888,7 @@ void em4x50_info(em4x50_data_t *etd) {
status = (bsuccess << 1) + blogin; status = (bsuccess << 1) + blogin;
lf_finalize(); lf_finalize();
reply_ng(CMD_ACK, status, (uint8_t *)words, 136); reply_ng(CMD_LF_EM4X50_INFO, status, (uint8_t *)words, 136);
} }
void em4x50_read(em4x50_data_t *etd) { void em4x50_read(em4x50_data_t *etd) {
@ -931,14 +931,14 @@ void em4x50_read(em4x50_data_t *etd) {
LOW(GPIO_SSC_DOUT); LOW(GPIO_SSC_DOUT);
lf_finalize(); lf_finalize();
reply_ng(CMD_ACK, status, (uint8_t *)words, 136); reply_ng(CMD_LF_EM4X50_READ, status, (uint8_t *)words, 136);
} }
//============================================================================== //==============================================================================
// write functions // write functions
//============================================================================== //==============================================================================
static bool write(uint32_t word, uint32_t addresses) { static int write(uint32_t word, uint32_t addresses) {
// writes <word> to specified <address> // writes <word> to specified <address>
@ -953,11 +953,13 @@ static bool write(uint32_t word, uint32_t addresses) {
// send data // send data
em4x50_reader_send_word(word); em4x50_reader_send_word(word);
// wait for T0 * EM4X50_T_TAG_TWA (write access time) if (tearoff_hook() == PM3_ETEAROFF) { // tearoff occured
wait_timer0(T0 * EM4X50_T_TAG_TWA); reply_ng(CMD_LF_EM4X50_WRITE, PM3_ETEAROFF, NULL, 0);
return PM3_ETEAROFF;
} else {
// wait for T0 * EM4X50_T_TAG_TWA (write access time) // wait for T0 * EM4X50_T_TAG_TWA (write access time)
wait_timer(FPGA_TIMER_0, T0 * EM4X50_T_TAG_TWA); wait_timer0(T0 * EM4X50_T_TAG_TWA);
// look for ACK sequence // look for ACK sequence
if (check_ack(false)) { if (check_ack(false)) {
@ -969,16 +971,15 @@ static bool write(uint32_t word, uint32_t addresses) {
} }
} }
} else { } else {
if (DBGLEVEL >= DBG_DEBUG) if (DBGLEVEL >= DBG_DEBUG)
Dbprintf("error in command request"); Dbprintf("error in command request");
} }
return PM3_ESOFT; return false;
} }
static bool write_password(uint32_t password, uint32_t new_password) { static int write_password(uint32_t password, uint32_t new_password) {
// changes password from <password> to <new_password> // changes password from <password> to <new_password>
@ -990,11 +991,17 @@ static bool write_password(uint32_t password, uint32_t new_password) {
// send address data // send address data
em4x50_reader_send_word(password); em4x50_reader_send_word(password);
if (tearoff_hook() == PM3_ETEAROFF) { // tearoff occured
reply_ng(CMD_LF_EM4X50_WRITE, PM3_ETEAROFF, NULL, 0);
return PM3_ETEAROFF;
} else {
// wait for T0 * EM4x50_T_TAG_TPP (processing pause time) // wait for T0 * EM4x50_T_TAG_TPP (processing pause time)
wait_timer0(T0 * EM4X50_T_TAG_TPP); wait_timer0(T0 * EM4X50_T_TAG_TPP);
// wait for T0 * EM4x50_T_TAG_TPP (processing pause time) // look for ACK sequence and send rm request
wait_timer(FPGA_TIMER_0, T0 * EM4X50_T_TAG_TPP); // during following listen window
if (check_ack(true)) {
// send new password // send new password
em4x50_reader_send_word(new_password); em4x50_reader_send_word(new_password);
@ -1008,7 +1015,6 @@ static bool write_password(uint32_t password, uint32_t new_password) {
} }
} }
} else { } else {
if (DBGLEVEL >= DBG_DEBUG) if (DBGLEVEL >= DBG_DEBUG)
Dbprintf("error in command request"); Dbprintf("error in command request");
@ -1036,9 +1042,14 @@ void em4x50_write(em4x50_data_t *etd) {
blogin = login(etd->password1); blogin = login(etd->password1);
// write word to given address // write word to given address
if (write(etd->word, etd->addresses)) { int res = write(etd->word, etd->addresses);
if (res == PM3_ETEAROFF) {
lf_finalize();
return;
}
if (res == PM3_SUCCESS) { if (res == PM3_SUCCESS) {
// to verify result reset EM4x50 // to verify result reset EM4x50
if (reset()) { if (reset()) {
@ -1058,7 +1069,7 @@ void em4x50_write(em4x50_data_t *etd) {
status = (bsuccess << 1) + blogin; status = (bsuccess << 1) + blogin;
lf_finalize(); lf_finalize();
reply_ng(CMD_ACK, status, (uint8_t *)words, 136); reply_ng(CMD_LF_EM4X50_WRITE, status, (uint8_t *)words, 136);
} }
void em4x50_write_password(em4x50_data_t *etd) { void em4x50_write_password(em4x50_data_t *etd) {
@ -1073,8 +1084,15 @@ void em4x50_write_password(em4x50_data_t *etd) {
if (get_signalproperties() && find_em4x50_tag()) { if (get_signalproperties() && find_em4x50_tag()) {
// login and change password // login and change password
if (login(etd->password1)) if (login(etd->password1)) {
bsuccess = write_password(etd->password1, etd->password2);
int res = write_password(etd->password1, etd->password2);
if (res == PM3_ETEAROFF) {
lf_finalize();
return;
}
bsuccess = (res == PM3_SUCCESS);
}
} }
lf_finalize(); lf_finalize();
@ -1134,7 +1152,7 @@ void em4x50_wipe(uint32_t *password) {
} }
lf_finalize(); lf_finalize();
reply_ng(CMD_ACK, bsuccess, (uint8_t *)words, 136); reply_ng(CMD_LF_EM4X50_WIPE, bsuccess, (uint8_t *)words, 136);
} }
void em4x50_reset(void) { void em4x50_reset(void) {