Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / armsrc / crapto1.c

diff --git a/armsrc/crapto1.c b/armsrc/crapto1.c
index 9d491d1271ff1fdcda05b5ae980e1530f8d00ccc..c0a7fc32a3056ecb2d83f6281090f1f0d3b7f268 100644 (file)
--- a/armsrc/crapto1.c
+++ b/armsrc/crapto1.c
@@ -44,12 +44,12 @@ static void quicksort(uint32_t* const start, uint32_t* const stop)
                else if(*rit > *start)\r
                        --rit;\r
                else\r
                else if(*rit > *start)\r
                        --rit;\r
                else\r

-                       *it ^= (*it ^= *rit, *rit ^= *it);\r
+                       *it ^= ( (*it ^= *rit ), *rit ^= *it);\r

 \r
        if(*rit >= *start)\r
                --rit;\r
        if(rit != start)\r
 \r
        if(*rit >= *start)\r
                --rit;\r
        if(rit != start)\r

-               *rit ^= (*rit ^= *start, *start ^= *rit);\r
+               *rit ^= ( (*rit ^= *start), *start ^= *rit);\r

 \r
        quicksort(start, rit - 1);\r
        quicksort(rit + 1, stop);\r
 \r
        quicksort(start, rit - 1);\r
        quicksort(rit + 1, stop);\r


@@ -454,7 +454,7 @@ 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
        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
        s = statelist = malloc((sizeof *statelist) << 20);\r
        if(!s || !odd || !even) {\r
                free(statelist);\r