Refactor parity functions

- get rid of __asm function in crapto1.h, use gcc builtin function instead
- make parity functions available in common directory

diff --git a/armsrc/Makefile b/armsrc/Makefile
index b698d1f25626c90fc751fecc2fe34b76229018c6..73c2290e3d611c6704a7bef5fc92f3d299921d11 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -20,7 +20,7 @@ SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c
 SRC_ISO14443b = iso14443b.c
 SRC_CRAPTO1 = crypto1.c des.c aes.c
-SRC_CRC = iso14443crc.c crc.c crc16.c crc32.c
+SRC_CRC = iso14443crc.c crc.c crc16.c crc32.c parity.c
 
 #the FPGA bitstream files. Note: order matters!
 FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 76b821411cf4a95b8b860472df8e9231575c1417..bd3bd84571637f369b3166555e02d487077e4da6 100644 (file)
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -21,6 +21,8 @@
 #include "mifareutil.h"
 #include "BigBuf.h"
 #include "protocols.h"
+#include "parity.h"
+
 
 static uint32_t iso14a_timeout;
 int rsamples = 0;
@@ -123,25 +125,6 @@ static uint32_t LastProxToAirDuration;
 #define        SEC_Y 0x00
 #define        SEC_Z 0xc0
 
-const uint8_t OddByteParity[256] = {
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
-  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
-};
-
 
 void iso14a_set_trigger(bool enable) {
        trigger = enable;
@@ -180,11 +163,6 @@ void iso14a_set_ATS_timeout(uint8_t *ats) {
 // Generate the parity value for a byte sequence
 //
 //-----------------------------------------------------------------------------
-byte_t oddparity (const byte_t bt)
-{
-       return OddByteParity[bt];
-}
-
 void GetParity(const uint8_t *pbtCmd, uint16_t iLen, uint8_t *par)
 {
        uint16_t paritybit_cnt = 0;
@@ -193,7 +171,7 @@ void GetParity(const uint8_t *pbtCmd, uint16_t iLen, uint8_t *par)
 
        for (uint16_t i = 0; i < iLen; i++) {
                // Generate the parity bits
-               parityBits |= ((OddByteParity[pbtCmd[i]]) << (7-paritybit_cnt));
+               parityBits |= ((oddparity8(pbtCmd[i])) << (7-paritybit_cnt));
                if (paritybit_cnt == 7) {
                        par[paritybyte_cnt] = parityBits;       // save 8 Bits parity
                        parityBits = 0;                                         // and advance to next Parity Byte

diff --git a/armsrc/iso14443a.h b/armsrc/iso14443a.h
index ec99ab99a4f7426628d73ace74f10237b81838c3..60833f1838192bc2441268dfd992d6b7302fafc4 100644 (file)
--- a/armsrc/iso14443a.h
+++ b/armsrc/iso14443a.h
@@ -12,6 +12,7 @@
 
 #ifndef __ISO14443A_H
 #define __ISO14443A_H
+
 #include "common.h"
 #include "mifaresniff.h"
 
@@ -70,8 +71,6 @@ typedef struct {
 } tUart;
 
 
-
-extern byte_t oddparity (const byte_t bt);
 extern void GetParity(const uint8_t *pbtCmd, uint16_t len, uint8_t *par);
 extern void AppendCrc14443a(uint8_t *data, int len);
 

diff --git a/armsrc/mifarecmd.c b/armsrc/mifarecmd.c
index a3d6609db3413a136b6d5415e3296e103f90a28a..8f141d659605c174ffc1cd419cb7b612d5b82bab 100644 (file)
--- a/armsrc/mifarecmd.c
+++ b/armsrc/mifarecmd.c
@@ -16,6 +16,7 @@
 #include "mifarecmd.h"\r
 #include "apps.h"\r
 #include "util.h"\r
+#include "parity.h"\r
 #include "crc.h"\r
 \r
 // the block number for the ISO14443-4 PCB\r
@@ -595,9 +596,9 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){
 \r
 // Return 1 if the nonce is invalid else return 0\r
 int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {\r
-       return ((oddparity((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \\r
-       (oddparity((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \\r
-       (oddparity((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;\r
+       return ((oddparity8((Nt >> 24) & 0xFF) == ((parity[0]) ^ oddparity8((NtEnc >> 24) & 0xFF) ^ BIT(Ks1,16))) & \\r
+       (oddparity8((Nt >> 16) & 0xFF) == ((parity[1]) ^ oddparity8((NtEnc >> 16) & 0xFF) ^ BIT(Ks1,8))) & \\r
+       (oddparity8((Nt >> 8) & 0xFF) == ((parity[2]) ^ oddparity8((NtEnc >> 8) & 0xFF) ^ BIT(Ks1,0)))) ? 1 : 0;\r
 }\r
 \r
 \r
@@ -770,7 +771,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat
                        \r
                        // Parity validity check\r
                        for (j = 0; j < 4; j++) {\r
-                               par_array[j] = (oddparity(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));\r
+                               par_array[j] = (oddparity8(receivedAnswer[j]) != ((par[0] >> (7-j)) & 0x01));\r
                        }\r
                        \r
                        ncount = 0;\r

diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c
index 48fcd57a3691aa983bef9616dc89fe3dd52f4fff..6c84377858b9daa1f9d04835d9cb0b1f107b118b 100644 (file)
--- a/armsrc/mifareutil.c
+++ b/armsrc/mifareutil.c
@@ -13,6 +13,7 @@
 #include "proxmark3.h"\r
 #include "apps.h"\r
 #include "util.h"\r
+#include "parity.h"\r
 #include "string.h"\r
 \r
 #include "iso14443crc.h"\r
@@ -50,7 +51,7 @@ void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, u
                data[i] = crypto1_byte(pcs, 0x00, 0) ^ data[i];\r
                if((i&0x0007) == 0) \r
                        par[i>>3] = 0;\r
-               par[i>>3] |= (((filter(pcs->odd) ^ oddparity(bt)) & 0x01)<<(7-(i&0x0007)));\r
+               par[i>>3] |= (((filter(pcs->odd) ^ oddparity8(bt)) & 0x01)<<(7-(i&0x0007)));\r
        }       \r
        return;\r
 }\r
@@ -99,7 +100,7 @@ int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd,
                for (pos = 0; pos < 4; pos++)\r
                {\r
                        ecmd[pos] = crypto1_byte(pcs, 0x00, 0) ^ dcmd[pos];\r
-                       par[0] |= (((filter(pcs->odd) ^ oddparity(dcmd[pos])) & 0x01) << (7-pos));\r
+                       par[0] |= (((filter(pcs->odd) ^ oddparity8(dcmd[pos])) & 0x01) << (7-pos));\r
                }       \r
 \r
                ReaderTransmitPar(ecmd, sizeof(ecmd), par, timing);\r
@@ -193,7 +194,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        for (pos = 0; pos < 4; pos++)\r
        {\r
                mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];\r
-               par[0] |= (((filter(pcs->odd) ^ oddparity(nr[pos])) & 0x01) << (7-pos));\r
+               par[0] |= (((filter(pcs->odd) ^ oddparity8(nr[pos])) & 0x01) << (7-pos));\r
        }       \r
                \r
        // Skip 32 bits in pseudo random generator\r
@@ -204,7 +205,7 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
        {\r
                nt = prng_successor(nt,8);\r
                mf_nr_ar[pos] = crypto1_byte(pcs,0x00,0) ^ (nt & 0xff);\r
-               par[0] |= (((filter(pcs->odd) ^ oddparity(nt & 0xff)) & 0x01) << (7-pos));\r
+               par[0] |= (((filter(pcs->odd) ^ oddparity8(nt)) & 0x01) << (7-pos));\r
        }       \r
                \r
        // Transmit reader nonce and reader answer\r
@@ -427,7 +428,7 @@ int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t bl
        for (pos = 0; pos < 18; pos++)\r
        {\r
                d_block_enc[pos] = crypto1_byte(pcs, 0x00, 0) ^ d_block[pos];\r
-               par[pos>>3] |= (((filter(pcs->odd) ^ oddparity(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));\r
+               par[pos>>3] |= (((filter(pcs->odd) ^ oddparity8(d_block[pos])) & 0x01) << (7 - (pos&0x0007)));\r
        }       \r
 \r
        ReaderTransmitPar(d_block_enc, sizeof(d_block_enc), par, NULL);\r

diff --git a/client/Makefile b/client/Makefile
index 1df870b59acbb27ce303d2772f50715b48e1f7f4..d59787c3810f0aa9b16ce2cb3ba8dafde0ec6132 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -67,6 +67,7 @@ CMDSRCS =     crapto1/crapto1.c\
                        loclass/fileutils.c\
                        whereami.c\
                        mifarehost.c\
+                       parity.c\
                        crc.c \
                        crc16.c \
                        crc64.c \

diff --git a/client/cmdhf.c b/client/cmdhf.c
index cb71b93b4f568367bfce75eba6fa8fd21fe8e6b0..dcfb1bdd38d98af1b1b8504c386feb5883ea8f12 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -16,6 +16,7 @@
 #include "data.h"
 #include "ui.h"
 #include "iso14443crc.h"
+#include "parity.h"
 #include "cmdmain.h"
 #include "cmdparser.h"
 #include "cmdhf.h"
@@ -481,14 +482,8 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 
        for (int j = 0; j < data_len && j/16 < 16; j++) {
 
-               int oddparity = 0x01;
-               int k;
-
-               for (k=0 ; k<8 ; k++) {
-                       oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
-               }
                uint8_t parityBits = parityBytes[j>>3];
-               if (protocol != ISO_14443B && (isResponse || protocol == ISO_14443A) && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+               if (protocol != ISO_14443B && (isResponse || protocol == ISO_14443A) && (oddparity8(frame[j]) != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
                } else {
                        snprintf(line[j/16]+(( j % 16) * 4), 110, " %02x ", frame[j]);

diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index 47a85a1afcab361c025eb71a92906655c33d8205..718cb703dc34df92563294104f06f3ad797a5342 100644 (file)
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -17,6 +17,7 @@
 #include "cmdparser.h"
 #include "common.h"
 #include "util.h"
+#include "parity.h"
 #include "hitag2.h"
 #include "hitagS.h"
 #include "cmdmain.h"
@@ -107,15 +108,9 @@ int CmdLFHitagList(const char *Cmd)
                char line[1000] = "";
                int j;
                for (j = 0; j < len; j++) {
-                 int oddparity = 0x01;
-                 int k;
-
-                 for (k=0;k<8;k++) {
-                       oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
-                 }
 
                  //if((parityBits >> (len - j - 1)) & 0x01) {
-                 if (isResponse && (oddparity != ((parityBits >> (len - j - 1)) & 0x01))) {
+                 if (isResponse && (oddparity8(frame[j]) != ((parityBits >> (len - j - 1)) & 0x01))) {
                        sprintf(line+(j*4), "%02x!  ", frame[j]);
                  }
                  else {

diff --git a/common/crapto1/crapto1.c b/common/crapto1/crapto1.c
index 013517310eda970204fe2a25f834f63439fa809b..9187460bb5198c82136683e28f3cf81bd9ef3fe0 100644 (file)
--- a/common/crapto1/crapto1.c
+++ b/common/crapto1/crapto1.c
@@ -18,7 +18,9 @@
     Copyright (C) 2008-2014 bla <blapost@gmail.com>
 */
 #include "crapto1.h"
+
 #include <stdlib.h>
+#include "parity.h"
 
 #if !defined LOWMEM && defined __GNUC__
 static uint8_t filterlut[1 << 20];
@@ -117,8 +119,8 @@ update_contribution(uint32_t *item, const uint32_t mask1, const uint32_t mask2)
 {
        uint32_t p = *item >> 25;
 
-       p = p << 1 | parity(*item & mask1);
-       p = p << 1 | parity(*item & mask2);
+       p = p << 1 | evenparity32(*item & mask1);
+       p = p << 1 | evenparity32(*item & mask2);
        *item = p << 24 | (*item & 0xffffff);
 }
 
@@ -174,10 +176,10 @@ recover(uint32_t *o_head, uint32_t *o_tail, uint32_t oks,
 
        if(rem == -1) {
                for(e = e_head; e <= e_tail; ++e) {
-                       *e = *e << 1 ^ parity(*e & LF_POLY_EVEN) ^ !!(in & 4);
+                       *e = *e << 1 ^ evenparity32(*e & LF_POLY_EVEN) ^ !!(in & 4);
                        for(o = o_head; o <= o_tail; ++o, ++sl) {
                                sl->even = *o;
-                               sl->odd = *e ^ parity(*o & LF_POLY_ODD);
+                               sl->odd = *e ^ evenparity32(*o & LF_POLY_ODD);
                                sl[1].odd = sl[1].even = 0;
                        }
                }
@@ -329,30 +331,30 @@ struct Crypto1State* lfsr_recovery64(uint32_t ks2, uint32_t ks3)
                        continue;
 
                for(j = 0; j < 19; ++j)
-                       low = low << 1 | parity(i & S1[j]);
+                       low = low << 1 | evenparity32(i & S1[j]);
                for(j = 0; j < 32; ++j)
-                       hi[j] = parity(i & T1[j]);
+                       hi[j] = evenparity32(i & T1[j]);
 
                for(; tail >= table; --tail) {
                        for(j = 0; j < 3; ++j) {
                                *tail = *tail << 1;
-                               *tail |= parity((i & C1[j]) ^ (*tail & C2[j]));
+                               *tail |= evenparity32((i & C1[j]) ^ (*tail & C2[j]));
                                if(filter(*tail) != oks[29 + j])
                                        goto continue2;
                        }
 
                        for(j = 0; j < 19; ++j)
-                               win = win << 1 | parity(*tail & S2[j]);
+                               win = win << 1 | evenparity32(*tail & S2[j]);
 
                        win ^= low;
                        for(j = 0; j < 32; ++j) {
-                               win = win << 1 ^ hi[j] ^ parity(*tail & T2[j]);
+                               win = win << 1 ^ hi[j] ^ evenparity32(*tail & T2[j]);
                                if(filter(win) != eks[j])
                                        goto continue2;
                        }
 
-                       *tail = *tail << 1 | parity(LF_POLY_EVEN & *tail);
-                       sl->odd = *tail ^ parity(LF_POLY_ODD & win);
+                       *tail = *tail << 1 | evenparity32(LF_POLY_EVEN & *tail);
+                       sl->odd = *tail ^ evenparity32(LF_POLY_ODD & win);
                        sl->even = win;
                        ++sl;
                        sl->odd = sl->even = 0;
@@ -380,7 +382,7 @@ uint8_t lfsr_rollback_bit(struct Crypto1State *s, uint32_t in, int fb)
        out ^= !!in;
        out ^= (ret = filter(s->odd)) & !!fb;
 
-       s->even |= parity(out) << 23;
+       s->even |= evenparity32(out) << 23;
        return ret;
 }
 /** lfsr_rollback_byte
@@ -486,11 +488,11 @@ check_pfx_parity(uint32_t prefix, uint32_t rresp, uint8_t parities[8][8],
                nr = ks1 ^ (prefix | c << 5);
                rr = ks2 ^ rresp;
 
-               good &= parity(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
-               good &= parity(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
-               good &= parity(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
-               good &= parity(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
-               good &= parity(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
+               good &= evenparity32(nr & 0x000000ff) ^ parities[c][3] ^ BIT(ks2, 24);
+               good &= evenparity32(rr & 0xff000000) ^ parities[c][4] ^ BIT(ks2, 16);
+               good &= evenparity32(rr & 0x00ff0000) ^ parities[c][5] ^ BIT(ks2,  8);
+               good &= evenparity32(rr & 0x0000ff00) ^ parities[c][6] ^ BIT(ks2,  0);
+               good &= evenparity32(rr & 0x000000ff) ^ parities[c][7] ^ ks3;
        }
 
        return sl + good;

diff --git a/common/crapto1/crapto1.h b/common/crapto1/crapto1.h
index 96ab96a27ed662fd9d39ee8ec820ca98178547e3..8e79d224060f91b95a47d9b91fe7911cce1294f3 100644 (file)
--- a/common/crapto1/crapto1.h
+++ b/common/crapto1/crapto1.h
@@ -53,7 +53,7 @@ int nonce_distance(uint32_t from, uint32_t to);
        int __i;\
        for(; __n < 1 << 16; N = prng_successor(__M = ++__n, 16))\
                for(__i = FSIZE - 1; __i >= 0; __i--)\
-                       if(BIT(FILTER, __i) ^ parity(__M & 0xFF01))\
+                       if(BIT(FILTER, __i) ^ evenparity32(__M & 0xFF01))\
                                break;\
                        else if(__i)\
                                __M = prng_successor(__M, (__i == 7) ? 48 : 8);\
@@ -63,24 +63,6 @@ int nonce_distance(uint32_t from, uint32_t to);
 #define LF_POLY_EVEN (0x870804)
 #define BIT(x, n) ((x) >> (n) & 1)
 #define BEBIT(x, n) BIT(x, (n) ^ 24)
-static inline int parity(uint32_t x)
-{
-#if !defined __i386__ || !defined __GNUC__
-       x ^= x >> 16;
-       x ^= x >> 8;
-       x ^= x >> 4;
-       return BIT(0x6996, x & 0xf);
-#else
-        __asm(    "movl %1, %%eax\n"
-               "mov %%ax, %%cx\n"
-               "shrl $0x10, %%eax\n"
-               "xor %%ax, %%cx\n"
-                "xor %%ch, %%cl\n"
-                "setpo %%al\n"
-                "movzx %%al, %0\n": "=r"(x) : "r"(x): "eax","ecx");
-       return x;
-#endif
-}
 static inline int filter(uint32_t const x)
 {
        uint32_t f;

diff --git a/common/crapto1/crypto1.c b/common/crapto1/crypto1.c
index 61f6fe662639c6b64247da0a48adc22d8ba1efd9..19b71cbb1f455ef605104be7d1177721c3502b46 100644 (file)
--- a/common/crapto1/crypto1.c
+++ b/common/crapto1/crypto1.c
@@ -18,7 +18,9 @@
        Copyright (C) 2008-2008 bla <blapost@gmail.com>
 */
 #include "crapto1.h"
+
 #include <stdlib.h>
+#include "parity.h"
 
 #define SWAPENDIAN(x)\
        (x = (x >> 8 & 0xff00ff) | (x & 0xff00ff) << 8, x = x >> 16 | x << 16)
@@ -73,7 +75,7 @@ uint8_t crypto1_bit(struct Crypto1State *s, uint8_t in, int is_encrypted)
        feedin ^= !!in;
        feedin ^= LF_POLY_ODD & s->odd;
        feedin ^= LF_POLY_EVEN & s->even;
-       s->even = s->even << 1 | parity(feedin);
+       s->even = s->even << 1 | evenparity32(feedin);
 
        t = s->odd, s->odd = s->even, s->even = t;
 

diff --git a/common/parity.c b/common/parity.c
new file mode 100644 (file)
index 0000000..5eabd3e
--- /dev/null
+++ b/common/parity.c
@@ -0,0 +1,28 @@
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// parity functions (all defined in parity.h)
+//-----------------------------------------------------------------------------
+
+#include <stdint.h>
+
+const uint8_t OddByteParity[256] = {
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  0, 1, 1, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 1, 1, 0,
+  1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1
+};

diff --git a/common/parity.h b/common/parity.h
new file mode 100644 (file)
index 0000000..615fdee
--- /dev/null
+++ b/common/parity.h
@@ -0,0 +1,53 @@
+//-----------------------------------------------------------------------------
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Parity functions
+//-----------------------------------------------------------------------------
+
+// all functions defined in header file by purpose. Allows compiler optimizations. 
+
+#ifndef __PARITY_H
+#define __PARITY_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+extern const uint8_t OddByteParity[256];
+
+
+static inline bool oddparity8(const uint8_t x) {
+       return OddByteParity[x];
+}
+
+
+static inline bool evenparity8(const uint8_t x) {
+       return !OddByteParity[x];
+}
+
+
+static inline bool evenparity32(uint32_t x) 
+{
+#if !defined __GNUC__
+       x ^= x >> 16;
+       x ^= x >> 8;
+       return evenparity8(x);
+#else
+       return __builtin_parity(x);
+#endif
+}
+
+
+static inline bool oddparity32(uint32_t x) 
+{
+#if !defined __GNUC__
+       x ^= x >> 16;
+       x ^= x >> 8;
+       return oddparity8(x);
+#else
+       return !__builtin_parity(x);
+#endif
+}
+
+#endif /* __PARITY_H */

diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index da7d431a4edb917ea81369cff3cddc285dd41bea..ab1623a87ccff9f3a0dda875cc8c44aef2809182 100755 (executable)
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -1,10 +1,10 @@
-VPATH = ../../common/crapto1 ../../client
+VPATH = ../../common ../../common/crapto1 ../../client
 CC = gcc
 LD = gcc
 CFLAGS = -I../../common -I../../client -Wall -O4
 LDFLAGS =
 
-OBJS = crypto1.o crapto1.o util.o mfkey.o
+OBJS = crypto1.o crapto1.o parity.o util.o mfkey.o
 EXES = mfkey32 mfkey64
 WINEXES = $(patsubst %, %.exe, $(EXES))