X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/8130eba4d127d1093f55334998f25230f0731a92..ab74872d40cf1f6b91344909e307ae788a3f8497:/client/nonce2key/crapto1.c
diff --git a/client/nonce2key/crapto1.c b/client/nonce2key/crapto1.c
index 8754c3c9..9f6f7f6b 100644
--- a/client/nonce2key/crapto1.c
+++ b/client/nonce2key/crapto1.c
@@ -24,56 +24,17 @@
static uint8_t filterlut[1 << 20];
static void __attribute__((constructor)) fill_lut()
{
- uint32_t i;
- for(i = 0; i < 1 << 20; ++i)
- filterlut[i] = filter(i);
+ uint32_t i;
+ for(i = 0; i < 1 << 20; ++i)
+ filterlut[i] = filter(i);
}
#define filter(x) (filterlut[(x) & 0xfffff])
#endif
-static void quicksort(uint32_t* const start, uint32_t* const stop)
-{
- uint32_t *it = start + 1, *rit = stop, t;
-
- if(it > rit)
- return;
-
- while(it < rit)
- if(*it <= *start)
- ++it;
- else if(*rit > *start)
- --rit;
- else
- t = *it, *it = *rit, *rit = t;
-
- if(*rit >= *start)
- --rit;
- if(rit != start)
- t = *rit, *rit = *start, *start = t;
-
- quicksort(start, rit - 1);
- quicksort(rit + 1, stop);
-}
-/** binsearch
- * Binary search for the first occurence of *stop's MSB in sorted [start,stop]
- */
-static inline uint32_t* binsearch(uint32_t *start, uint32_t *stop)
-{
- uint32_t mid, val = *stop & 0xff000000;
- while(start != stop)
- if(start[mid = (stop - start) >> 1] > val)
- stop = &start[mid];
- else
- start += mid + 1;
-
- return start;
-}
-
/** update_contribution
* helper, calculates the partial linear feedback contributions and puts in MSB
*/
-static inline void
-update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
+static inline void update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
{
uint32_t p = *item >> 25;
@@ -85,8 +46,7 @@ update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
/** extend_table
* using a bit of the keystream extend the table of possible lfsr states
*/
-static inline void
-extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
+static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)
{
in <<= 24;
for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
@@ -109,26 +69,27 @@ extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in
*/
static inline void extend_table_simple(uint32_t *tbl, uint32_t **end, int bit)
{
- for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)
+ for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1) {
if(filter(*tbl) ^ filter(*tbl | 1)) { // replace
*tbl |= filter(*tbl) ^ bit;
} else if(filter(*tbl) == bit) { // insert
*++*end = *++tbl;
*tbl = tbl[-1] | 1;
- } else // drop
+ } else { // drop
*tbl-- = *(*end)--;
+ }
+ }
}
-
-
/** recover
* recursively narrow down the search space, 4 bits of keystream at a time
*/
static struct Crypto1State*
recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
uint32_t *e_head, uint32_t *e_tail, uint32_t eks, int rem,
- struct Crypto1State *sl, uint32_t in)
+ struct Crypto1State *sl, uint32_t in, bucket_array_t bucket)
{
- uint32_t *o, *e, i;
+ uint32_t *o, *e;
+ bucket_info_t bucket_info;
if(rem == -1) {
for(e = e_head; e <= e_tail; ++e) {
@@ -142,35 +103,26 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
return sl;
}
- for(i = 0; i < 4 && rem--; i++) {
+ for(uint32_t i = 0; i < 4 && rem--; i++) {
oks >>= 1;
eks >>= 1;
in >>= 2;
- extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1,
- LF_POLY_ODD << 1, 0);
+ extend_table(o_head, &o_tail, oks & 1, LF_POLY_EVEN << 1 | 1, LF_POLY_ODD << 1, 0);
if(o_head > o_tail)
return sl;
- extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD,
- LF_POLY_EVEN << 1 | 1, in & 3);
+ extend_table(e_head, &e_tail, eks & 1, LF_POLY_ODD, LF_POLY_EVEN << 1 | 1, in & 3);
if(e_head > e_tail)
return sl;
}
- quicksort(o_head, o_tail);
- quicksort(e_head, e_tail);
+ bucket_sort_intersect(e_head, e_tail, o_head, o_tail, &bucket_info, bucket);
- while(o_tail >= o_head && e_tail >= e_head)
- if(((*o_tail ^ *e_tail) >> 24) == 0) {
- o_tail = binsearch(o_head, o = o_tail);
- e_tail = binsearch(e_head, e = e_tail);
- sl = recover(o_tail--, o, oks,
- e_tail--, e, eks, rem, sl, in);
+ for (int i = bucket_info.numbuckets - 1; i >= 0; i--) {
+ sl = recover(bucket_info.bucket_info[1][i].head, bucket_info.bucket_info[1][i].tail, oks,
+ bucket_info.bucket_info[0][i].head, bucket_info.bucket_info[0][i].tail, eks,
+ rem, sl, in, bucket);
}
- else if(*o_tail > *e_tail)
- o_tail = binsearch(o_head, o_tail) - 1;
- else
- e_tail = binsearch(e_head, e_tail) - 1;
return sl;
}
@@ -203,6 +155,18 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
statelist->odd = statelist->even = 0;
+ // allocate memory for out of place bucket_sort
+ bucket_array_t bucket;
+
+ for (uint32_t i = 0; i < 2; i++) {
+ for (uint32_t j = 0; j <= 0xff; j++) {
+ bucket[i][j].head = malloc(sizeof(uint32_t)<<14);
+ if (!bucket[i][j].head) {
+ goto out;
+ }
+ }
+ }
+
// initialize statelists: add all possible states which would result into the rightmost 2 bits of the keystream
for(i = 1 << 20; i >= 0; --i) {
if(filter(i) == (oks & 1))
@@ -220,17 +184,19 @@ struct Crypto1State* lfsr_recovery32(uint32_t ks2, uint32_t in)
// the statelists now contain all states which could have generated the last 10 Bits of the keystream.
// 22 bits to go to recover 32 bits in total. From now on, we need to take the "in"
// parameter into account.
- in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00);
- recover(odd_head, odd_tail, oks,
- even_head, even_tail, eks, 11, statelist, in << 1);
+ in = (in >> 16 & 0xff) | (in << 16) | (in & 0xff00); // Byte swapping
+ recover(odd_head, odd_tail, oks, even_head, even_tail, eks, 11, statelist, in << 1, bucket);
out:
+ for (uint32_t i = 0; i < 2; i++)
+ for (uint32_t j = 0; j <= 0xff; j++)
+ free(bucket[i][j].head);
free(odd_head);
free(even_head);
return statelist;
}
-static const uint32_t S1[] = { 0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
+static const uint32_t S1[] = { 0x62141, 0x310A0, 0x18850, 0x0C428, 0x06214,
0x0310A, 0x85E30, 0xC69AD, 0x634D6, 0xB5CDE, 0xDE8DA, 0x6F46D, 0xB3C83,
0x59E41, 0xA8995, 0xD027F, 0x6813F, 0x3409F, 0x9E6FA};
static const uint32_t S2[] = { 0x3A557B00, 0x5D2ABD80, 0x2E955EC0, 0x174AAF60,
@@ -501,6 +467,21 @@ static struct Crypto1State* check_pfx_parity(uint32_t prefix, uint32_t rresp, ui
return sl + good;
}
+static struct Crypto1State* check_pfx_parity_ex(uint32_t prefix, uint32_t odd, uint32_t even, struct Crypto1State* sl) {
+
+ uint32_t c = 0;
+
+ sl->odd = odd ^ fastfwd[1][c];
+ sl->even = even ^ fastfwd[0][c];
+
+ lfsr_rollback_bit(sl, 0, 0);
+ lfsr_rollback_bit(sl, 0, 0);
+ lfsr_rollback_bit(sl, 0, 0);
+ lfsr_rollback_word(sl, 0, 0);
+ lfsr_rollback_word(sl, prefix | c << 5, 1);
+
+ return ++sl;
+}
/** lfsr_common_prefix
* Implentation of the common prefix attack.
@@ -520,12 +501,11 @@ struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8]
odd = lfsr_prefix_ks(ks, 1);
even = lfsr_prefix_ks(ks, 0);
- s = statelist = malloc((sizeof *statelist) << 21);
+ s = statelist = malloc((sizeof *statelist) << 20);
if(!s || !odd || !even) {
free(statelist);
- free(odd);
- free(even);
- return 0;
+ statelist = 0;
+ goto out;
}
for(o = odd; *o + 1; ++o)
@@ -537,7 +517,39 @@ struct Crypto1State* lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8]
}
s->odd = s->even = 0;
+out:
+ free(odd);
+ free(even);
+ return statelist;
+}
+
+struct Crypto1State* lfsr_common_prefix_ex(uint32_t pfx, uint8_t ks[8])
+{
+ struct Crypto1State *statelist, *s;
+ uint32_t *odd, *even, *o, *e, top;
+ odd = lfsr_prefix_ks(ks, 1);
+ even = lfsr_prefix_ks(ks, 0);
+
+ s = statelist = malloc((sizeof *statelist) << 20);
+ if(!s || !odd || !even) {
+ free(statelist);
+ statelist = 0;
+ goto out;
+ }
+
+ for(o = odd; *o + 1; ++o)
+ for(e = even; *e + 1; ++e)
+ for(top = 0; top < 64; ++top) {
+ *o += 1 << 21;
+ *e += (!(top & 7) + 1) << 21;
+ s = check_pfx_parity_ex(pfx, *o, *e, s);
+ }
+
+ // in this version, -1 signifies end of states
+ s->odd = s->even = -1;
+
+out:
free(odd);
free(even);
return statelist;