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

style

Browse Source
This commit is contained in:
iceman1001
2019-03-19 00:07:57 +01:00
parent fb9d34447e
commit 8b8b67ac76
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/crapto1/crapto1.c
View File

@@ -252,7 +252,7 @@ struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3) {
continue; continue;
for (j = 0; j < 19; ++j) for (j = 0; j < 19; ++j)
low = low << 1 | evenparity32(i & S1[j]); low = low << 1 | (evenparity32(i & S1[j]));
for (j = 0; j < 32; ++j) for (j = 0; j < 32; ++j)
hi[j] = evenparity32(i & T1[j]); hi[j] = evenparity32(i & T1[j]);
@@ -265,17 +265,17 @@ struct Crypto1State *lfsr_recovery64(uint32_t ks2, uint32_t ks3) {
} }
for (j = 0; j < 19; ++j) for (j = 0; j < 19; ++j)
win = win << 1 | evenparity32(*tail & S2[j]); win = win << 1 | (evenparity32(*tail & S2[j]));
win ^= low; win ^= low;
for (j = 0; j < 32; ++j) { for (j = 0; j < 32; ++j) {
win = win << 1 ^ hi[j] ^ evenparity32(*tail & T2[j]); win = win << 1 ^ hi[j] ^ (evenparity32(*tail & T2[j]));
if (filter(win) != eks[j]) if (filter(win) != eks[j])
goto continue2; goto continue2;
} }
*tail = *tail << 1 | evenparity32(LF_POLY_EVEN & *tail); *tail = *tail << 1 | (evenparity32(LF_POLY_EVEN & *tail));
sl->odd = *tail ^ evenparity32(LF_POLY_ODD & win); sl->odd = *tail ^ (evenparity32(LF_POLY_ODD & win));
sl->even = win; sl->even = win;
++sl; ++sl;
sl->odd = sl->even = 0; sl->odd = sl->even = 0;
@@ -303,7 +303,7 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb) {
out ^= !!in; out ^= !!in;
out ^= (ret = filter(s->odd)) & !!fb; out ^= (ret = filter(s->odd)) & !!fb;
s->even |= evenparity32(out) << 23; s->even |= (evenparity32(out)) << 23;
return ret; return ret;
} }
/** lfsr_rollback_byte /** lfsr_rollback_byte

2
common/crapto1/crypto1.c
View File

@@ -72,7 +72,7 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted) {
feedin ^= !!in; feedin ^= !!in;
feedin ^= LF_POLY_ODD & s->odd; feedin ^= LF_POLY_ODD & s->odd;
feedin ^= LF_POLY_EVEN & s->even; feedin ^= LF_POLY_EVEN & s->even;
s->even = s->even << 1 | evenparity32(feedin); s->even = s->even << 1 | (evenparity32(feedin));
t = s->odd; t = s->odd;
s->odd = s->even; s->odd = s->even;