dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hardnested: get rid of shift by negative value

Browse Source
This commit is contained in:
Philippe Teuwen
2019-04-09 17:49:02 +02:00
parent 87660df8f2
commit 258332894b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/cmdhfmfhard.c
View File

@@ -367,9 +367,10 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even) {
uint32_t st = state; uint32_t st = state;
uint16_t part_sum = 0; uint16_t part_sum = 0;
if (odd_even == ODD_STATE) { if (odd_even == ODD_STATE) {
for (uint16_t i = 0; i < 5; i++) { part_sum ^= filter(st);
part_sum ^= filter(st); for (uint16_t i = 0; i < 4; i++) {
st = (st << 1) | ((j >> (3 - i)) & 0x01) ; st = (st << 1) | ((j >> (3 - i)) & 0x01) ;
part_sum ^= filter(st);
} }
part_sum ^= 1; // XOR 1 cancelled out for the other 8 bits part_sum ^= 1; // XOR 1 cancelled out for the other 8 bits
} else { } else {

3
client/hardnested/hardnested_tables.c
View File

@@ -44,9 +44,10 @@ static uint16_t PartialSumProperty(uint32_t state, odd_even_t odd_even) {
uint32_t st = state; uint32_t st = state;
uint16_t part_sum = 0; uint16_t part_sum = 0;
if (odd_even == ODD_STATE) { if (odd_even == ODD_STATE) {
part_sum ^= filter(st);
for (uint16_t i = 0; i < 4; i++) { for (uint16_t i = 0; i < 4; i++) {
part_sum ^= filter(st);
st = (st << 1) | ((j >> (3 - i)) & 0x01) ; st = (st << 1) | ((j >> (3 - i)) & 0x01) ;
part_sum ^= filter(st);
} }
part_sum ^= 1; // XOR 1 cancelled out for the other 8 bits part_sum ^= 1; // XOR 1 cancelled out for the other 8 bits
} else { } else {