RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-09 17:56:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

defined stop condition for reading processes, otherwise pm 'crashes' if there's no tag on device

Browse source
This commit is contained in:
tharexde 2020-06-28 21:31:39 +02:00
parent 81cd478883
commit 9ce9a82803
1 changed files with 87 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

153
armsrc/em4x50.c
View file

@ -75,6 +75,7 @@ static em4x50_tag_t tag = {
#define EM4X50_T_WAITING_FOR_LIW 500 #define EM4X50_T_WAITING_FOR_LIW 500
#define EM4X50_T_TAG_TPP 64 #define EM4X50_T_TAG_TPP 64
#define EM4X50_T_TAG_TWA 64 #define EM4X50_T_TAG_TWA 64
#define EM4X50_T_TAG_INIT 2112
#define EM4X50_TAG_TOLERANCE 8 #define EM4X50_TAG_TOLERANCE 8
#define EM4X50_TAG_WORD 45 #define EM4X50_TAG_WORD 45
@ -237,19 +238,34 @@ static void em4x50_setup_read(void) {
// functions for "reader" use case // functions for "reader" use case
static void get_signalproperties(void) { static bool get_signalproperties(void) {
// calculate signal properties (mean amplitudes) from measured data: // calculate signal properties (mean amplitudes) from measured data:
// 32 amplitudes (maximum values) -> mean amplitude value -> gHigh -> gLow // 32 amplitudes (maximum values) -> mean amplitude value -> gHigh -> gLow
bool signal_found = false;
int no_periods = 32, pct = 75, noise = 140; int no_periods = 32, pct = 75, noise = 140;
uint8_t sample = 0, sample_ref = 127; uint8_t sample = 0, sample_ref = 127;
uint8_t sample_max_mean = 0; uint8_t sample_max_mean = 0;
uint8_t sample_max[no_periods]; uint8_t sample_max[no_periods];
uint32_t sample_max_sum = 0; uint32_t sample_max_sum = 0;
// wait until signal/noise > 1 // wait until signal/noise > 1 (max. 32 periods)
while (AT91C_BASE_SSC->SSC_RHR < noise); for (int i = 0; i < T0 * no_periods; i++) {
// about 2 samples per bit period
wait_timer(0, T0 * EM4X50_T_TAG_HALF_PERIOD);
if (AT91C_BASE_SSC->SSC_RHR > noise) {
signal_found = true;
break;
}
}
if (!signal_found)
return false;
// calculate mean maximum value of 32 periods, each period has a length of // calculate mean maximum value of 32 periods, each period has a length of
// 3 single "full periods" to eliminate the influence of a listen window // 3 single "full periods" to eliminate the influence of a listen window
@ -274,6 +290,7 @@ static void get_signalproperties(void) {
gHigh = sample_ref + pct * (sample_max_mean - sample_ref) / 100; gHigh = sample_ref + pct * (sample_max_mean - sample_ref) / 100;
gLow = sample_ref - pct * (sample_max_mean - sample_ref) / 100; gLow = sample_ref - pct * (sample_max_mean - sample_ref) / 100;
return true;
} }
static int get_next_bit(void) { static int get_next_bit(void) {
@ -736,31 +753,32 @@ void em4x50_info(em4x50_data_t *etd) {
init_tag(); init_tag();
em4x50_setup_read(); em4x50_setup_read();
// set gHigh and gLow // set gHigh and gLow
get_signalproperties(); if (get_signalproperties()) {
if (etd->pwd_given) {
// try to login with given password if (etd->pwd_given) {
blogin = login(etd->password);
} else { // try to login with given password
blogin = login(etd->password);
// if no password is given, try to login with "0x00000000"
blogin = login(password);
} else {
// if no password is given, try to login with "0x00000000"
blogin = login(password);
}
bsuccess = selective_read(addresses);
} }
bsuccess = selective_read(addresses);
status = (bsuccess << 1) + blogin; status = (bsuccess << 1) + blogin;
lf_finalize(); lf_finalize();
reply_ng(CMD_ACK, status, (uint8_t *)tag.sectors, 238); reply_ng(CMD_ACK, status, (uint8_t *)tag.sectors, 238);
} }
void em4x50_sread(em4x50_data_t *etd) { void em4x50_read(em4x50_data_t *etd) {
// reads in two different ways: // reads in two different ways:
// - using "selective read mode" -> bidirectional communication // - using "selective read mode" -> bidirectional communication
@ -776,25 +794,26 @@ void em4x50_sread(em4x50_data_t *etd) {
em4x50_setup_read(); em4x50_setup_read();
// set gHigh and gLow // set gHigh and gLow
get_signalproperties(); if (get_signalproperties()) {
if (etd->addr_given) { if (etd->addr_given) {
// selective read mode // selective read mode
// try to login with given password // try to login with given password
if (etd->pwd_given) if (etd->pwd_given)
blogin = login(etd->password); blogin = login(etd->password);
// only one word has to be read -> first word read = last word read // only one word has to be read -> first word read = last word read
addresses[2] = addresses[3] = etd->address; addresses[2] = addresses[3] = etd->address;
bsuccess = selective_read(addresses); bsuccess = selective_read(addresses);
} else { } else {
// standard read mode // standard read mode
bsuccess = standard_read(&now); bsuccess = standard_read(&now);
}
} }
status = (now << 2) + (bsuccess << 1) + blogin; status = (now << 2) + (bsuccess << 1) + blogin;
@ -896,40 +915,41 @@ void em4x50_write(em4x50_data_t *etd) {
em4x50_setup_read(); em4x50_setup_read();
// set gHigh and gLow // set gHigh and gLow
get_signalproperties(); if (get_signalproperties()) {
// reorder word according to datasheet // reorder word according to datasheet
msb2lsb_word(etd->word); msb2lsb_word(etd->word);
// if password is given try to login first // if password is given try to login first
if (etd->pwd_given) if (etd->pwd_given)
blogin = login(etd->password); blogin = login(etd->password);
// write word to given address // write word to given address
if (write(etd->word, etd->address)) { if (write(etd->word, etd->address)) {
// to verify result reset EM4x50 // to verify result reset EM4x50
if (reset()) { if (reset()) {
// if password is given login // if password is given login
if (etd->pwd_given) if (etd->pwd_given)
blogin &= login(etd->password); blogin &= login(etd->password);
// call a selective read // call a selective read
addresses[2] = addresses[3] = etd->address; addresses[2] = addresses[3] = etd->address;
if (selective_read(addresses)) { if (selective_read(addresses)) {
// compare with given word // compare with given word
word[0] = tag.sectors[etd->address][0]; word[0] = tag.sectors[etd->address][0];
word[1] = tag.sectors[etd->address][1]; word[1] = tag.sectors[etd->address][1];
word[2] = tag.sectors[etd->address][2]; word[2] = tag.sectors[etd->address][2];
word[3] = tag.sectors[etd->address][3]; word[3] = tag.sectors[etd->address][3];
msb2lsb_word(word); msb2lsb_word(word);
bsuccess = true; bsuccess = true;
for (int i = 0; i < 4; i++) for (int i = 0; i < 4; i++)
bsuccess &= (word[i] == etd->word[i]) ? true : false; bsuccess &= (word[i] == etd->word[i]) ? true : false;
}
} }
} }
} }
@ -950,11 +970,12 @@ void em4x50_write_password(em4x50_data_t *etd) {
em4x50_setup_read(); em4x50_setup_read();
// set gHigh and gLow // set gHigh and gLow
get_signalproperties(); if (get_signalproperties()) {
// login and change password // login and change password
if (login(etd->password)) { if (login(etd->password)) {
bsuccess = write_password(etd->password, etd->new_password); bsuccess = write_password(etd->password, etd->new_password);
}
} }
lf_finalize(); lf_finalize();