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

textual

Browse source
This commit is contained in:
iceman1001 2020-02-04 17:37:19 +01:00
commit a9ffcc6892
1 changed files with 16 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

28
armsrc/Standalone/lf_icehid.c
View file

@ -105,7 +105,7 @@ uint32_t IceEM410xdemod() {
memset(entry, 0, sizeof(entry)); memset(entry, 0, sizeof(entry));
if (size == 128) { if (size == 128) {
sprintf((char *)entry, "EM XL TAG ID: %06lx%08lx%08lx - (%05ld_%03ld_%08ld)", sprintf((char *)entry, "EM XL TAG ID: %06lx%08lx%08lx - (%05ld_%03ld_%08ld)\n",
hi, hi,
(uint32_t)(lo >> 32), (uint32_t)(lo >> 32),
(uint32_t)lo, (uint32_t)lo,
@ -113,7 +113,7 @@ uint32_t IceEM410xdemod() {
(uint32_t)((lo >> 16LL) & 0xFF), (uint32_t)((lo >> 16LL) & 0xFF),
(uint32_t)(lo & 0xFFFFFF)); (uint32_t)(lo & 0xFFFFFF));
} else { } else {
sprintf((char *)entry, "EM TAG ID: %02lx%08lx - (%05ld_%03ld_%08ld)", sprintf((char *)entry, "EM TAG ID: %02lx%08lx - (%05ld_%03ld_%08ld)\n",
(uint32_t)(lo >> 32), (uint32_t)(lo >> 32),
(uint32_t)lo, (uint32_t)lo,
(uint32_t)(lo & 0xFFFF), (uint32_t)(lo & 0xFFFF),
@ -122,8 +122,6 @@ uint32_t IceEM410xdemod() {
} }
append(entry, strlen((char*)entry)); append(entry, strlen((char*)entry));
Dbprintf("strlen %d", strlen((char*)entry));
Dbprintf("%s", entry); Dbprintf("%s", entry);
BigBuf_free(); BigBuf_free();
return PM3_SUCCESS; return PM3_SUCCESS;
@ -184,8 +182,8 @@ uint32_t IceAWIDdemod() {
uint32_t IceIOdemod() { uint32_t IceIOdemod() {
int dummyIdx = 0; int dummyIdx = 0;
uint8_t version = 0, facilitycode = 0, crc = 0; uint8_t version = 0, facilitycode = 0;
uint16_t number = 0, calccrc = 0; uint16_t number = 0;
uint32_t hi = 0, lo = 0; uint32_t hi = 0, lo = 0;
size_t size = MIN(12000, BigBuf_max_traceLen()); size_t size = MIN(12000, BigBuf_max_traceLen());
@ -208,31 +206,19 @@ uint32_t IceIOdemod() {
facilitycode = bytebits_to_byte(dest + idx + 18, 8); facilitycode = bytebits_to_byte(dest + idx + 18, 8);
number = (bytebits_to_byte(dest + idx + 36, 8) << 8) | (bytebits_to_byte(dest + idx + 45, 8)); //36,9 number = (bytebits_to_byte(dest + idx + 36, 8) << 8) | (bytebits_to_byte(dest + idx + 45, 8)); //36,9
crc = bytebits_to_byte(dest + idx + 54, 8);
for (uint8_t i = 1; i < 6; ++i)
calccrc += bytebits_to_byte(dest + idx + 9 * i, 8);
calccrc &= 0xff;
calccrc = 0xff - calccrc;
char *crcStr = (crc == calccrc) ? "ok" : "!crc";
uint8_t entry[64]; uint8_t entry[64];
memset(entry, 0, sizeof(entry)); memset(entry, 0, sizeof(entry));
sprintf((char *)entry, "IO Prox XSF(%02d)%02x:%05d (%08lx%08lx) [%02x %s] \n" sprintf((char *)entry, "IO Prox XSF(%02d)%02x:%05d (%08lx%08lx)\n"
, version , version
, facilitycode , facilitycode
, number , number
, hi , hi
, lo , lo
, crc
, crcStr
); );
append(entry, strlen((char*)entry)); append(entry, strlen((char*)entry));
Dbprintf("%s", entry); Dbprintf("%s", entry);
BigBuf_free(); BigBuf_free();
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -330,7 +316,7 @@ uint32_t IceHIDDemod() {
} }
void ModInfo(void) { void ModInfo(void) {
DbpString(" LF HID / IOprox / AWID / EM4100 collector mode - a.k.a IceHID (Iceman)"); DbpString(_YELLOW_(" LF HID / IOprox / AWID / EM4100 collector mode") " - a.k.a IceHID (Iceman)");
} }
void RunMod() { void RunMod() {
@ -341,7 +327,7 @@ void RunMod() {
StandAloneMode(); StandAloneMode();
Dbprintf("[=] LF HID collector a.k.a IceHID started"); Dbprintf(_YELLOW_("[=] Standalone mode IceHID started"));
rdv40_spiffs_lazy_mount(); rdv40_spiffs_lazy_mount();