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

Reorder & simplify code

Browse source
This commit is contained in:
DarkMatterMatt 2021-02-11 17:36:02 +13:00
commit 73465e5167
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/src/cmdlfgallagher.c
View file

@ -212,24 +212,22 @@ static void createBlocks(uint32_t *blocks, uint8_t rc, uint16_t fc, uint32_t cn,
// more obfuscation // more obfuscation
scramble(arr, ARRAYLEN(arr)); scramble(arr, ARRAYLEN(arr));
// every byte is followed by a bit which is the inverse of the last bit
uint8_t bonus_bit[8] = {0};
for (int i = 0; i < ARRAYLEN(bonus_bit); i++) {
bonus_bit[i] = !(arr[i] & 0x1);
}
// calculate checksum
uint8_t crc = CRC8Cardx(arr, ARRAYLEN(arr));
blocks[0] = blocks[1] = blocks[2] = 0; blocks[0] = blocks[1] = blocks[2] = 0;
uint8_t pos = 0; uint8_t pos = 0;
// magic prefix, then the bytes with their extra bit, then the CRC // magic prefix
setBitsInBlocks(blocks, &pos, 0x7fea, 16); setBitsInBlocks(blocks, &pos, 0x7fea, 16);
for (int i = 0; i < ARRAYLEN(arr); i++) { for (int i = 0; i < ARRAYLEN(arr); i++) {
// data byte
setBitsInBlocks(blocks, &pos, arr[i], 8); setBitsInBlocks(blocks, &pos, arr[i], 8);
setBitsInBlocks(blocks, &pos, bonus_bit[i], 1);
// every byte is followed by a bit which is the inverse of the last bit
setBitsInBlocks(blocks, &pos, !(arr[i] & 0x1), 1);
} }
// checksum
uint8_t crc = CRC8Cardx(arr, ARRAYLEN(arr));
setBitsInBlocks(blocks, &pos, crc, 8); setBitsInBlocks(blocks, &pos, crc, 8);
} }