FIX: makeing sure the "make clean" now deletes the nonce2key.exe file.

[proxmark3-svn] / armsrc / crapto1.c

diff --git a/armsrc/crapto1.c b/armsrc/crapto1.c
index 9d491d1271ff1fdcda05b5ae980e1530f8d00ccc..8721375717f2364a57f8aa14e87b0c11086d5d06 100644 (file)
--- a/armsrc/crapto1.c
+++ b/armsrc/crapto1.c
@@ -34,6 +34,7 @@ static void __attribute__((constructor)) fill_lut()
 static void quicksort(uint32_t* const start, uint32_t* const stop)\r
 {\r
        uint32_t *it = start + 1, *rit = stop;\r
+       uint32_t tmp;\r
 \r
        if(it > rit)\r
                return;\r
@@ -43,13 +44,19 @@ static void quicksort(uint32_t* const start, uint32_t* const stop)
                        ++it;\r
                else if(*rit > *start)\r
                        --rit;\r
-               else\r
-                       *it ^= (*it ^= *rit, *rit ^= *it);\r
+               else {\r
+                       tmp = *it;\r
+                       *it = *rit;\r
+                       *rit = tmp;\r
+               }\r
 \r
        if(*rit >= *start)\r
                --rit;\r
-       if(rit != start)\r
-               *rit ^= (*rit ^= *start, *start ^= *rit);\r
+       if(rit != start) {\r
+               tmp = *rit;\r
+               *rit = *start;\r
+               *start = tmp;\r
+       }\r
 \r
        quicksort(start, rit - 1);\r
        quicksort(rit + 1, stop);\r
@@ -85,8 +92,7 @@ update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
 /** extend_table\r
  * using a bit of the keystream extend the table of possible lfsr states\r
  */\r
-static inline void\r
-extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)\r
+static inline void extend_table(uint32_t *tbl, uint32_t **end, int bit, int m1, int m2, uint32_t in)\r
 {\r
        in <<= 24;\r
        for(*tbl <<= 1; tbl <= *end; *++tbl <<= 1)\r
@@ -319,9 +325,12 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
 {\r
        int out;\r
        uint8_t ret;\r
+       uint32_t tmp;\r
 \r
        s->odd &= 0xffffff;\r
-       s->odd ^= (s->odd ^= s->even, s->even ^= s->odd);\r
+       tmp = s->odd;\r
+       s->odd = s->even;\r
+       s->even = tmp;\r
 \r
        out = s->even & 1;\r
        out ^= LF_POLY_EVEN & (s->even >>= 1);\r
@@ -337,9 +346,20 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
  */\r
 uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)\r
 {\r
-       int i, ret = 0;\r
+/*     int i, ret = 0;\r
        for (i = 7; i >= 0; --i)\r
                ret |= lfsr_rollback_bit(s, BIT(in, i), fb) << i;\r
+*/\r
+// unfold loop 20160112\r
+       uint8_t ret = 0;\r
+       ret |= lfsr_rollback_bit(s, BIT(in, 7), fb) << 7;\r
+       ret |= lfsr_rollback_bit(s, BIT(in, 6), fb) << 6;\r
+       ret |= lfsr_rollback_bit(s, BIT(in, 5), fb) << 5;\r
+       ret |= lfsr_rollback_bit(s, BIT(in, 4), fb) << 4;\r
+       ret |= lfsr_rollback_bit(s, BIT(in, 3), fb) << 3;\r
+       ret |= lfsr_rollback_bit(s, BIT(in, 2), fb) << 2;\r
+       ret |= lfsr_rollback_bit(s, BIT(in, 1), fb) << 1;\r
+       ret |= lfsr_rollback_bit(s, BIT(in, 0), fb) << 0;\r
        return ret;\r
 }\r
 /** lfsr_rollback_word\r
@@ -347,10 +367,48 @@ uint8_t lfsr_rollback_byte(struct Crypto1State *s, uint32_t in, int fb)
  */\r
 uint32_t lfsr_rollback_word(struct Crypto1State *s, uint32_t in, int fb)\r
 {\r
-       int i;\r
+/*     int i;\r
        uint32_t ret = 0;\r
        for (i = 31; i >= 0; --i)\r
                ret |= lfsr_rollback_bit(s, BEBIT(in, i), fb) << (i ^ 24);\r
+*/\r
+// unfold loop 20160112\r
+       uint32_t ret = 0;\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 31), fb) << (31 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 30), fb) << (30 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 29), fb) << (29 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 28), fb) << (28 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 27), fb) << (27 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 26), fb) << (26 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 25), fb) << (25 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 24), fb) << (24 ^ 24);\r
+\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 23), fb) << (23 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 22), fb) << (22 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 21), fb) << (21 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 20), fb) << (20 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 19), fb) << (19 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 18), fb) << (18 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 17), fb) << (17 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 16), fb) << (16 ^ 24);\r
+\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 15), fb) << (15 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 14), fb) << (14 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 13), fb) << (13 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 12), fb) << (12 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 11), fb) << (11 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 10), fb) << (10 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 9), fb) << (9 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 8), fb) << (8 ^ 24);\r
+\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 7), fb) << (7 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 6), fb) << (6 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 5), fb) << (5 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 4), fb) << (4 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 3), fb) << (3 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 2), fb) << (2 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 1), fb) << (1 ^ 24);\r
+       ret |= lfsr_rollback_bit(s, BEBIT(in, 0), fb) << (0 ^ 24);\r
        return ret;\r
 }\r
 \r
@@ -440,7 +498,7 @@ check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8],
        }\r
 \r
        return sl + good;\r
-} \r
+}\r
 \r
 \r
 /** lfsr_common_prefix\r
@@ -454,12 +512,12 @@ lfsr_common_prefix(uint32_t pfx, uint32_t rr, uint8_t ks[8], uint8_t par[8][8])
 \r
        odd = lfsr_prefix_ks(ks, 1);\r
        even = lfsr_prefix_ks(ks, 0);\r
-\r
+       \r
        s = statelist = malloc((sizeof *statelist) << 20);\r
        if(!s || !odd || !even) {\r
                free(statelist);\r
                statelist = 0;\r
-                goto out;\r
+               goto out;\r
        }\r
 \r
        for(o = odd; *o + 1; ++o)\r