mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 05:43:48 -07:00
Merge pull request #1976 from natmchugh/master
Add paxton id to hitag2 info
This commit is contained in:
commit
bf897786f2
2 changed files with 34 additions and 0 deletions
|
@ -55,6 +55,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
|
||||||
- Changed `hf legic view` - now also print the decoded info of the dump file (@0xdeb)
|
- Changed `hf legic view` - now also print the decoded info of the dump file (@0xdeb)
|
||||||
- Now `script run hf_mf_ultimatecard.lua -u` supports 10bytes UID (@alejandro12120)
|
- Now `script run hf_mf_ultimatecard.lua -u` supports 10bytes UID (@alejandro12120)
|
||||||
- Update documentation for installation on macOS with MacPorts (@linuxgemini)
|
- Update documentation for installation on macOS with MacPorts (@linuxgemini)
|
||||||
|
- Added possible Paxton id to hitag2 tag info output
|
||||||
|
|
||||||
## [Nitride.4.16191][2023-01-29]
|
## [Nitride.4.16191][2023-01-29]
|
||||||
- Changed `build_all_firmwares.sh` to fit GENERIC 256kb firmware images (@doegox)
|
- Changed `build_all_firmwares.sh` to fit GENERIC 256kb firmware images (@doegox)
|
||||||
|
|
|
@ -324,6 +324,37 @@ static int CmdLFHitagSim(const char *Cmd) {
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static void printHitag2PaxtonDowngrade(const uint8_t *data) {
|
||||||
|
|
||||||
|
uint64_t bytes = 0;
|
||||||
|
uint64_t num = 0;
|
||||||
|
uint64_t paxton_id = 0;
|
||||||
|
uint16_t skip = 48;
|
||||||
|
uint16_t digit = 0;
|
||||||
|
uint64_t mask = 0xF80000000000;
|
||||||
|
|
||||||
|
for (int i = 16; i < 22; i++) {
|
||||||
|
bytes = (bytes * 0x100) + data[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int j = 0; j< 8; j++) {
|
||||||
|
num = bytes & mask;
|
||||||
|
skip -= 5;
|
||||||
|
mask = mask >> 5;
|
||||||
|
digit = (num >> skip & 15);
|
||||||
|
paxton_id = (paxton_id * 10) + digit;
|
||||||
|
|
||||||
|
if (j == 5) {
|
||||||
|
skip -= 2;
|
||||||
|
mask = mask >> 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
PrintAndLogEx(INFO, "-------- " _CYAN_("Possible de-scramble patterns") " ---------");
|
||||||
|
PrintAndLogEx(SUCCESS, "Paxton id: %lu | 0x%lx", paxton_id, paxton_id);
|
||||||
|
}
|
||||||
|
|
||||||
static void printHitag2Configuration(uint8_t config) {
|
static void printHitag2Configuration(uint8_t config) {
|
||||||
|
|
||||||
char msg[100];
|
char msg[100];
|
||||||
|
@ -630,6 +661,8 @@ static int CmdLFHitagReader(const char *Cmd) {
|
||||||
|
|
||||||
// print data
|
// print data
|
||||||
print_hex_break(data, 48, 4);
|
print_hex_break(data, 48, 4);
|
||||||
|
|
||||||
|
printHitag2PaxtonDowngrade(data);
|
||||||
}
|
}
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue