FIX: fixes warning for "%zu" string formatspecifier on MINGW systems. (Thanks to...

[proxmark3-svn] / client / loclass / ikeys.c

diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 18571b0de146fc83103a5e4922d0349721f3c9ae..a870f86d83b6f0256454c021d7f634e44e6cb23c 100644 (file)
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -1,5 +1,17 @@
 /*****************************************************************************
 /*****************************************************************************

- * This file is part of iClassCipher. It is a reconstructon of the cipher engine
+ * WARNING
+ *
+ * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. 
+ * 
+ * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL 
+ * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, 
+ * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. 
+ * 
+ * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. 
+ *
+ *****************************************************************************
+ *
+ * This file is part of loclass. It is a reconstructon of the cipher engine

  * used in iClass, and RFID techology.
  *
  * The implementation is based on the work performed by
  * used in iClass, and RFID techology.
  *
  * The implementation is based on the work performed by


@@ -18,9 +30,13 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License

- * along with IClassCipher.  If not, see <http://www.gnu.org/licenses/>.
+ * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * 
+ * 

  ****************************************************************************/
 /**
  ****************************************************************************/
 /**

+

 From "Dismantling iclass":
        This section describes in detail the built-in key diversification algorithm of iClass.
        Besides the obvious purpose of deriving a card key from a master key, this
 From "Dismantling iclass":
        This section describes in detail the built-in key diversification algorithm of iClass.
        Besides the obvious purpose of deriving a card key from a master key, this


@@ -40,32 +56,28 @@ From "Dismantling iclass":
        similar key bytes, which could produce a strong bias in the cipher. Finally, the
        output of hash0 is the diversified card key k = k [0] , . . . , k [7] ∈ (F 82 ) 8 .
 
        similar key bytes, which could produce a strong bias in the cipher. Finally, the
        output of hash0 is the diversified card key k = k [0] , . . . , k [7] ∈ (F 82 ) 8 .
 

-

 **/
 **/

-
-

 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>

-#include "cipherutils.h"
-#include "cipher.h"
-#include "../util.h"

 #include <stdio.h>
 #include <stdio.h>

-#include "des.h"

 #include <inttypes.h>
 #include <inttypes.h>

+#include "fileutils.h"
+#include "cipherutils.h"
+#include "des.h"

 
 uint8_t pi[35] = {0x0F,0x17,0x1B,0x1D,0x1E,0x27,0x2B,0x2D,0x2E,0x33,0x35,0x39,0x36,0x3A,0x3C,0x47,0x4B,0x4D,0x4E,0x53,0x55,0x56,0x59,0x5A,0x5C,0x63,0x65,0x66,0x69,0x6A,0x6C,0x71,0x72,0x74,0x78};
 
 static des_context ctx_enc = {DES_ENCRYPT,{0}};
 static des_context ctx_dec = {DES_DECRYPT,{0}};
 
 
 uint8_t pi[35] = {0x0F,0x17,0x1B,0x1D,0x1E,0x27,0x2B,0x2D,0x2E,0x33,0x35,0x39,0x36,0x3A,0x3C,0x47,0x4B,0x4D,0x4E,0x53,0x55,0x56,0x59,0x5A,0x5C,0x63,0x65,0x66,0x69,0x6A,0x6C,0x71,0x72,0x74,0x78};
 
 static des_context ctx_enc = {DES_ENCRYPT,{0}};
 static des_context ctx_dec = {DES_DECRYPT,{0}};
 

-static bool debug_print = false;
+static int debug_print = 0;

 
 /**
  * @brief The key diversification algorithm uses 6-bit bytes.
  * This implementation uses 64 bit uint to pack seven of them into one
  * variable. When they are there, they are placed as follows:
 
 /**
  * @brief The key diversification algorithm uses 6-bit bytes.
  * This implementation uses 64 bit uint to pack seven of them into one
  * variable. When they are there, they are placed as follows:

- * XXXX XXXX N0 .... N7, occupying the lsat 48 bits.
+ * XXXX XXXX N0 .... N7, occupying the last 48 bits.

  *
  * This function picks out one from such a collection
  * @param all
  *
  * This function picks out one from such a collection
  * @param all


@@ -75,7 +87,6 @@ static bool debug_print = false;
 uint8_t getSixBitByte(uint64_t c, int n)
 {
        return (c >> (42-6*n)) & 0x3F;
 uint8_t getSixBitByte(uint64_t c, int n)
 {
        return (c >> (42-6*n)) & 0x3F;

-       //return (c >> n*6) & 0x3f;

 }
 
 /**
 }
 
 /**


@@ -103,7 +114,13 @@ void pushbackSixBitByte(uint64_t *c, uint8_t z, int n)
        (*c) |= masked;
 
 }
        (*c) |= masked;
 
 }

-
+/**
+ * @brief Swaps the z-values.
+ * If the input value has format XYZ0Z1...Z7, the output will have the format
+ * XYZ7Z6...Z0 instead
+ * @param c
+ * @return
+ */

 uint64_t swapZvalues(uint64_t c)
 {
        uint64_t newz = 0;
 uint64_t swapZvalues(uint64_t c)
 {
        uint64_t newz = 0;


@@ -124,45 +141,30 @@ uint64_t swapZvalues(uint64_t c)
 */
 uint64_t ck(int i, int j, uint64_t z)
 {
 */
 uint64_t ck(int i, int j, uint64_t z)
 {

-
-//     printf("ck( i=%d, j=%d), zi=[%d],zj=[%d] \n",i,j,getSixBitByte(z,i),getSixBitByte(z,j) );
-
-       if(i == 1 && j == -1)
-       {
+       if (i == 1 && j == -1) {

                // ck(1, −1, z [0] . . . z [3] ) = z [0] . . . z [3]
                return z;
                // ck(1, −1, z [0] . . . z [3] ) = z [0] . . . z [3]
                return z;

-
-       }else if( j == -1)
-       {
+       } else if( j == -1) {

                // ck(i, −1, z [0] . . . z [3] ) = ck(i − 1, i − 2, z [0] . . . z [3] )
                return ck(i-1,i-2, z);
        }
 
                // ck(i, −1, z [0] . . . z [3] ) = ck(i − 1, i − 2, z [0] . . . z [3] )
                return ck(i-1,i-2, z);
        }
 

-       if(getSixBitByte(z,i) == getSixBitByte(z,j))
+       if (getSixBitByte(z,i) == getSixBitByte(z,j))

        {
        {

-               // TODO, I dont know what they mean here in the paper

                //ck(i, j − 1, z [0] . . . z [i] ← j . . . z [3] )
                uint64_t newz = 0;
                int c;
                //ck(i, j − 1, z [0] . . . z [i] ← j . . . z [3] )
                uint64_t newz = 0;
                int c;

-               //printf("z[i]=z[i] (0x%02x), i=%d, j=%d\n",getSixBitByte(z,i),i,j );
-               for(c = 0; c < 4 ;c++)
-               {
+               for(c = 0; c < 4; c++) {

                        uint8_t val = getSixBitByte(z,c);
                        uint8_t val = getSixBitByte(z,c);

-                       if(c == i)
-                       {
-                               //printf("oops\n");
+                       if (c == i)

                                pushbackSixBitByte(&newz, j, c);
                                pushbackSixBitByte(&newz, j, c);

-                       }else
-                       {
+                       else

                                pushbackSixBitByte(&newz, val, c);
                                pushbackSixBitByte(&newz, val, c);

-                       }

                }
                return ck(i,j-1,newz);
                }
                return ck(i,j-1,newz);

-       }else
-       {
+       } else {

                return ck(i,j-1,z);
        }
                return ck(i,j-1,z);
        }

-

 }
 /**
 
 }
 /**
 


@@ -190,6 +192,9 @@ uint64_t check(uint64_t z)
 
        // ck(3, 2, z [4] . . . z [7] )
        uint64_t ck2 = ck(3,2, z << 24);
 
        // ck(3, 2, z [4] . . . z [7] )
        uint64_t ck2 = ck(3,2, z << 24);

+
+       //The ck function will place the values
+       // in the middle of z.

        ck1 &= 0x00000000FFFFFF000000;
        ck2 &= 0x00000000FFFFFF000000;
 
        ck1 &= 0x00000000FFFFFF000000;
        ck2 &= 0x00000000FFFFFF000000;
 


@@ -200,90 +205,42 @@ uint64_t check(uint64_t z)
 void permute(BitstreamIn *p_in, uint64_t z,int l,int r, BitstreamOut* out)
 {
        if(bitsLeft(p_in) == 0)
 void permute(BitstreamIn *p_in, uint64_t z,int l,int r, BitstreamOut* out)
 {
        if(bitsLeft(p_in) == 0)

-       {

                return;
                return;

-       }
+       

        bool pn = tailBit(p_in);
        if( pn ) // pn = 1
        {
                uint8_t zl = getSixBitByte(z,l);
        bool pn = tailBit(p_in);
        if( pn ) // pn = 1
        {
                uint8_t zl = getSixBitByte(z,l);

-               //printf("permute pushing, zl=0x%02x, zl+1=0x%02x\n", zl, zl+1);
+

                push6bits(out, zl+1);
                permute(p_in, z, l+1,r, out);
        }else // otherwise
        {
                uint8_t zr = getSixBitByte(z,r);
                push6bits(out, zl+1);
                permute(p_in, z, l+1,r, out);
        }else // otherwise
        {
                uint8_t zr = getSixBitByte(z,r);

-               //printf("permute pushing, zr=0x%02x\n", zr);
+

                push6bits(out, zr);
                permute(p_in,z,l,r+1,out);
        }
 }
                push6bits(out, zr);
                permute(p_in,z,l,r+1,out);
        }
 }

-void testPermute()
-{
-
-       uint64_t x = 0;
-       pushbackSixBitByte(&x,0x00,0);
-       pushbackSixBitByte(&x,0x01,1);
-       pushbackSixBitByte(&x,0x02,2);
-       pushbackSixBitByte(&x,0x03,3);
-       pushbackSixBitByte(&x,0x04,4);
-       pushbackSixBitByte(&x,0x05,5);
-       pushbackSixBitByte(&x,0x06,6);
-       pushbackSixBitByte(&x,0x07,7);
-
-       uint8_t mres[8] = { getSixBitByte(x, 0),
-                                               getSixBitByte(x, 1),
-                                               getSixBitByte(x, 2),
-                                               getSixBitByte(x, 3),
-                                               getSixBitByte(x, 4),
-                                               getSixBitByte(x, 5),
-                                               getSixBitByte(x, 6),
-                                               getSixBitByte(x, 7)};
-       printarr("input_perm", mres,8);
-
-       uint8_t p = ~pi[0];
-       BitstreamIn p_in = { &p, 8,0 };
-       uint8_t outbuffer[] = {0,0,0,0,0,0,0,0};
-       BitstreamOut out = {outbuffer,0,0};
-
-       permute(&p_in, x,0,4, &out);
-
-       uint64_t permuted = bytes_to_num(outbuffer,8);
-       //printf("zTilde 0x%"PRIX64"\n", zTilde);
-       permuted >>= 16;
-
-       uint8_t res[8] = { getSixBitByte(permuted, 0),
-                                               getSixBitByte(permuted, 1),
-                                               getSixBitByte(permuted, 2),
-                                               getSixBitByte(permuted, 3),
-                                               getSixBitByte(permuted, 4),
-                                               getSixBitByte(permuted, 5),
-                                               getSixBitByte(permuted, 6),
-                                               getSixBitByte(permuted, 7)};
-       printarr("permuted", res, 8);
-}
-void printbegin()
-{
-       if(! debug_print)
+void printbegin() {
+       if (debug_print < 2)

                return;
 
                return;
 

-       printf("          | x| y|z0|z1|z2|z3|z4|z5|z6|z7|\n");
+       prnlog("          | x| y|z0|z1|z2|z3|z4|z5|z6|z7|");

 }
 
 }
 

-void printState(char* desc, int x,int y, uint64_t c)
+void printState(char* desc, uint64_t c)

 {
 {

-       if(! debug_print)
+       if(debug_print < 2)

                return;
 
        printf("%s : ", desc);
                return;
 
        printf("%s : ", desc);

-       //uint8_t x =   (c & 0xFF00000000000000 ) >> 56;
-       //uint8_t y =   (c & 0x00FF000000000000 ) >> 48;
+       uint8_t x =     (c & 0xFF00000000000000 ) >> 56;
+       uint8_t y =     (c & 0x00FF000000000000 ) >> 48;

        printf("  %02x %02x", x,y);
        printf("  %02x %02x", x,y);

-       int i ;
-       for(i =0 ; i < 8 ; i++)
-       {
+       int i;
+       for(i = 0; i < 8; i++)

                printf(" %02x", getSixBitByte(c,i));
                printf(" %02x", getSixBitByte(c,i));

-       }

        printf("\n");
 }
 
        printf("\n");
 }
 


@@ -298,16 +255,18 @@ void printState(char* desc, int x,int y, uint64_t c)
  * @param k this is where the diversified key is put (should be 8 bytes)
  * @return
  */
  * @param k this is where the diversified key is put (should be 8 bytes)
  * @return
  */

-void hash0(uint64_t c, uint8_t *k)
+void hash0(uint64_t c, uint8_t k[8])

 {
 {

+       c = swapZvalues(c);
+

        printbegin();
        printbegin();

+       printState("origin",c);

        //These 64 bits are divided as c = x, y, z [0] , . . . , z [7]
        // x = 8 bits
        // y = 8 bits
        // z0-z7 6 bits each : 48 bits
        uint8_t x =     (c & 0xFF00000000000000 ) >> 56;
        uint8_t y =     (c & 0x00FF000000000000 ) >> 48;
        //These 64 bits are divided as c = x, y, z [0] , . . . , z [7]
        // x = 8 bits
        // y = 8 bits
        // z0-z7 6 bits each : 48 bits
        uint8_t x =     (c & 0xFF00000000000000 ) >> 56;
        uint8_t y =     (c & 0x00FF000000000000 ) >> 48;

-       printState("origin",x,y,c);

        int n;
        uint8_t zn, zn4, _zn, _zn4;
        uint64_t zP = 0;
        int n;
        uint8_t zn, zn4, _zn, _zn4;
        uint64_t zP = 0;


@@ -315,6 +274,7 @@ void hash0(uint64_t c, uint8_t *k)
        for(n = 0;  n < 4 ; n++)
        {
                zn = getSixBitByte(c,n);
        for(n = 0;  n < 4 ; n++)
        {
                zn = getSixBitByte(c,n);

+

                zn4 = getSixBitByte(c,n+4);
 
                _zn = (zn % (63-n)) + n;
                zn4 = getSixBitByte(c,n+4);
 
                _zn = (zn % (63-n)) + n;


@@ -322,22 +282,19 @@ void hash0(uint64_t c, uint8_t *k)
 
                pushbackSixBitByte(&zP, _zn,n);
                pushbackSixBitByte(&zP, _zn4,n+4);
 
                pushbackSixBitByte(&zP, _zn,n);
                pushbackSixBitByte(&zP, _zn4,n+4);

-

        }
        }

-       printState("x|y|z'",x,y,zP);

 
 

-       uint64_t zCaret = check(zP);
-       printState("x|y|z^",x,y,zP);
+       printState("0|0|z'",zP);

 
 

+       uint64_t zCaret = check(zP);
+       printState("0|0|z^",zP);

 
        uint8_t p = pi[x % 35];
 
        if(x & 1) //Check if x7 is 1
 
        uint8_t p = pi[x % 35];
 
        if(x & 1) //Check if x7 is 1

-       {

                p = ~p;
                p = ~p;

-       }
-    printState("p|y|z^",p,y,zP);
-       //if(debug_print) printf("p:%02x\n", p);
+
+       if(debug_print >= 2) prnlog("p:%02x", p);

 
        BitstreamIn p_in = { &p, 8,0 };
        uint8_t outbuffer[] = {0,0,0,0,0,0,0,0};
 
        BitstreamIn p_in = { &p, 8,0 };
        uint8_t outbuffer[] = {0,0,0,0,0,0,0,0};


@@ -346,21 +303,18 @@ void hash0(uint64_t c, uint8_t *k)
 
        //Out is now a buffer containing six-bit bytes, should be 48 bits
        // if all went well
 
        //Out is now a buffer containing six-bit bytes, should be 48 bits
        // if all went well

-       //printf("Permute output is %d num bits (48?)\n", out.numbits);

        //Shift z-values down onto the lower segment
 
        //Shift z-values down onto the lower segment
 

-       uint64_t zTilde = bytes_to_num(outbuffer,8);
+    uint64_t zTilde = x_bytes_to_num(outbuffer,8);

 
 

-       //printf("zTilde 0x%"PRIX64"\n", zTilde);

        zTilde >>= 16;
        zTilde >>= 16;

-       //printf("z~ 0x%"PRIX64"\n", zTilde);
-       printState("p|y|z~", p,y,zTilde);
+
+       printState("0|0|z~", zTilde);

 
        int i;
        int zerocounter =0 ;
 
        int i;
        int zerocounter =0 ;

-       for(i =0 ; i < 8  ; i++)
+       for(i = 0; i < 8; i++)

        {
        {

-

                // the key on index i is first a bit from y
                // then six bits from z,
                // then a bit from p
                // the key on index i is first a bit from y
                // then six bits from z,
                // then a bit from p


@@ -373,10 +327,9 @@ void hash0(uint64_t c, uint8_t *k)
                // First, place y(7-i) leftmost in k
                k[i] |= (y  << (7-i)) & 0x80 ;
 
                // First, place y(7-i) leftmost in k
                k[i] |= (y  << (7-i)) & 0x80 ;
 

-               //printf("y%d = %d\n",i,(y  << i) & 0x80);
+

 
                uint8_t zTilde_i = getSixBitByte(zTilde, i);
 
                uint8_t zTilde_i = getSixBitByte(zTilde, i);

-               //printf("zTilde_%d 0x%02x (should be <= 0x3F)\n",i, zTilde_i);

                // zTildeI is now on the form 00XXXXXX
                // with one leftshift, it'll be
                // 0XXXXXX0
                // zTildeI is now on the form 00XXXXXX
                // with one leftshift, it'll be
                // 0XXXXXX0


@@ -401,32 +354,128 @@ void hash0(uint64_t c, uint8_t *k)
                        k[i] |= zTilde_i & 0x7E;
                        k[i] |= (~p_i) & 1;
                }
                        k[i] |= zTilde_i & 0x7E;
                        k[i] |= (~p_i) & 1;
                }

-               if((k[i]  & 1 )== 0)
+               if ((k[i] & 1 )== 0)

                {
                {

-                       zerocounter ++;
+                       zerocounter++;

                }
        }
                }
        }

-       //printf("zerocounter=%d (should be 4)\n",zerocounter);
-       //printf("permute fin, y:0x%02x, x: 0x%02x\n", y, x);
+}
+/**
+ * @brief Performs Elite-class key diversification
+ * @param csn
+ * @param key
+ * @param div_key
+ */
+void diversifyKey(uint8_t csn[8], uint8_t key[8], uint8_t div_key[8])
+{
+       // Prepare the DES key
+       des_setkey_enc( &ctx_enc, key);

 
 

-       //return k;
+       uint8_t crypted_csn[8] = {0};
+
+       // Calculate DES(CSN, KEY)
+       des_crypt_ecb(&ctx_enc,csn, crypted_csn);
+
+       //Calculate HASH0(DES))
+    uint64_t crypt_csn = x_bytes_to_num(crypted_csn, 8);
+    //uint64_t crypted_csn_swapped = swapZvalues(crypt_csn);
+
+       hash0(crypt_csn,div_key);

 }
 
 }
 

-void reorder(uint8_t arr[8])
+void testPermute()

 {
 {

-       uint8_t tmp[4] = {arr[3],arr[2],arr[1], arr[0]};
-       arr[0] = arr[7];
-       arr[1] = arr[6];
-       arr[2] = arr[5];
-       arr[3] = arr[4];
-       arr[4] = tmp[0];//arr[3];
-       arr[5] = tmp[1];//arr[2];
-       arr[6] = tmp[2];//arr[3];
-       arr[7] = tmp[3];//arr[1]
+       uint64_t x = 0;
+       pushbackSixBitByte(&x,0x00,0);
+       pushbackSixBitByte(&x,0x01,1);
+       pushbackSixBitByte(&x,0x02,2);
+       pushbackSixBitByte(&x,0x03,3);
+       pushbackSixBitByte(&x,0x04,4);
+       pushbackSixBitByte(&x,0x05,5);
+       pushbackSixBitByte(&x,0x06,6);
+       pushbackSixBitByte(&x,0x07,7);
+
+       uint8_t mres[8] = { getSixBitByte(x, 0),
+                                               getSixBitByte(x, 1),
+                                               getSixBitByte(x, 2),
+                                               getSixBitByte(x, 3),
+                                               getSixBitByte(x, 4),
+                                               getSixBitByte(x, 5),
+                                               getSixBitByte(x, 6),
+                                               getSixBitByte(x, 7)};
+       printarr("input_perm", mres,8);
+
+       uint8_t p = ~pi[0];
+       BitstreamIn p_in = { &p, 8,0 };
+       uint8_t outbuffer[] = {0,0,0,0,0,0,0,0};
+       BitstreamOut out = {outbuffer,0,0};
+
+       permute(&p_in, x,0,4, &out);
+
+    uint64_t permuted = x_bytes_to_num(outbuffer,8);
+       //printf("zTilde 0x%"PRIX64"\n", zTilde);
+       permuted >>= 16;
+
+       uint8_t res[8] = { getSixBitByte(permuted, 0),
+                                               getSixBitByte(permuted, 1),
+                                               getSixBitByte(permuted, 2),
+                                               getSixBitByte(permuted, 3),
+                                               getSixBitByte(permuted, 4),
+                                               getSixBitByte(permuted, 5),
+                                               getSixBitByte(permuted, 6),
+                                               getSixBitByte(permuted, 7)};
+       printarr("permuted", res, 8);

 }
 
 }
 

-//extern void printarr(char * name, uint8_t* arr, int len);
+//These testcases are
+//{ UID , TEMP_KEY, DIV_KEY} using the specific key
+typedef struct
+{
+       uint8_t uid[8];
+       uint8_t t_key[8];
+       uint8_t div_key[8];
+} Testcase;
+
+int testDES(Testcase testcase, des_context ctx_enc, des_context ctx_dec)
+{
+       uint8_t des_encrypted_csn[8] = {0};
+       uint8_t decrypted[8] = {0};
+       uint8_t div_key[8] = {0};
+       int retval = des_crypt_ecb(&ctx_enc,testcase.uid,des_encrypted_csn);
+       retval |= des_crypt_ecb(&ctx_dec,des_encrypted_csn,decrypted);
+
+       if(memcmp(testcase.uid,decrypted,8) != 0)
+       {
+               //Decryption fail
+               prnlog("Encryption <-> Decryption FAIL");
+               printarr("Input", testcase.uid, 8);
+               printarr("Decrypted", decrypted, 8);
+               retval = 1;
+       }
+
+       if(memcmp(des_encrypted_csn,testcase.t_key,8) != 0)
+       {
+               //Encryption fail
+               prnlog("Encryption != Expected result");
+               printarr("Output", des_encrypted_csn, 8);
+               printarr("Expected", testcase.t_key, 8);
+               retval = 1;
+       }
+    uint64_t crypted_csn = x_bytes_to_num(des_encrypted_csn,8);
+       hash0(crypted_csn, div_key);

 
 

+       if(memcmp(div_key, testcase.div_key ,8) != 0)
+       {
+               //Key diversification fail
+               prnlog("Div key != expected result");
+               printarr("  csn   ", testcase.uid,8);
+               printarr("{csn}   ", des_encrypted_csn,8);
+               printarr("hash0   ", div_key, 8);
+               printarr("Expected", testcase.div_key, 8);
+               retval = 1;
+       }
+       return retval;
+}

 bool des_getParityBitFromKey(uint8_t key)
 {//The top 7 bits is used
        bool parity = ((key & 0x80) >> 7)
 bool des_getParityBitFromKey(uint8_t key)
 {//The top 7 bits is used
        bool parity = ((key & 0x80) >> 7)


@@ -435,35 +484,333 @@ bool des_getParityBitFromKey(uint8_t key)
                        ^ ((key & 0x04) >> 2) ^ ((key & 0x02) >> 1);
        return !parity;
 }
                        ^ ((key & 0x04) >> 2) ^ ((key & 0x02) >> 1);
        return !parity;
 }

-void des_checkParity(uint8_t* key)
+
+void des_checkParity(uint8_t* key) {
+       int i;
+       int fails = 0;
+       for(i = 0; i < 8; i++) {
+               bool parity = des_getParityBitFromKey(key[i]);
+               if (parity != (key[i] & 0x1)) {
+                       fails++;
+                       prnlog("[+] parity1 fail, byte %d [%02x] was %d, should be %d", i, key[i], (key[i] & 0x1), parity);
+               }
+       }
+       if(fails)
+               prnlog("[+] parity fails: %d", fails);
+       else
+               prnlog("[+] Key syntax is with parity bits inside each byte");
+}
+
+Testcase testcases[] ={
+
+       {{0x8B,0xAC,0x60,0x1F,0x53,0xB8,0xED,0x11},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0xAE,0x51,0xE5,0x62,0xE7,0x9A,0x99,0x39},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01},{0x04,0x02,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0x9B,0x21,0xE4,0x31,0x6A,0x00,0x29,0x62},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02},{0x06,0x04,0x02,0x08,0x01,0x03,0x05,0x07}},
+       {{0x65,0x24,0x0C,0x41,0x4F,0xC2,0x21,0x93},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04},{0x0A,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0x7F,0xEB,0xAE,0x93,0xE5,0x30,0x08,0xBD},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08},{0x12,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0x49,0x7B,0x70,0x74,0x9B,0x35,0x1B,0x83},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10},{0x22,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0x02,0x3C,0x15,0x6B,0xED,0xA5,0x64,0x6C},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20},{0x42,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0xE8,0x37,0xE0,0xE2,0xC6,0x45,0x24,0xF3},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40},{0x02,0x06,0x04,0x08,0x01,0x03,0x05,0x07}},
+       {{0xAB,0xBD,0x30,0x05,0x29,0xC8,0xF7,0x12},{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80},{0x02,0x08,0x06,0x04,0x01,0x03,0x05,0x07}},
+       {{0x17,0xE8,0x97,0xF0,0x99,0xB6,0x79,0x31},{0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00},{0x02,0x0C,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0x49,0xA4,0xF0,0x8F,0x5F,0x96,0x83,0x16},{0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00},{0x02,0x14,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0x60,0xF5,0x7E,0x54,0xAA,0x41,0x83,0xD4},{0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00},{0x02,0x24,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0x1D,0xF6,0x3B,0x6B,0x85,0x55,0xF0,0x4B},{0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00},{0x02,0x44,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0x1F,0xDC,0x95,0x1A,0xEA,0x6B,0x4B,0xB4},{0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00},{0x02,0x04,0x08,0x06,0x01,0x03,0x05,0x07}},
+       {{0xEC,0x93,0x72,0xF0,0x3B,0xA9,0xF5,0x0B},{0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00},{0x02,0x04,0x0A,0x08,0x01,0x03,0x05,0x07}},
+       {{0xDE,0x57,0x5C,0xBE,0x2D,0x55,0x03,0x12},{0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00},{0x02,0x04,0x0E,0x08,0x01,0x03,0x05,0x07}},
+       {{0x1E,0xD2,0xB5,0xCE,0x90,0xC9,0xC1,0xCC},{0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00},{0x02,0x04,0x16,0x08,0x01,0x03,0x05,0x07}},
+       {{0xD8,0x65,0x96,0x4E,0xE7,0x74,0x99,0xB8},{0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00},{0x02,0x04,0x26,0x08,0x01,0x03,0x05,0x07}},
+       {{0xE3,0x7A,0x29,0x83,0x31,0xD5,0x3A,0x54},{0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00},{0x02,0x04,0x46,0x08,0x01,0x03,0x05,0x07}},
+       {{0x3A,0xB5,0x1A,0x34,0x34,0x25,0x12,0xF0},{0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00},{0x02,0x04,0x06,0x0A,0x01,0x03,0x05,0x07}},
+       {{0xF2,0x88,0xEE,0x6F,0x70,0x6F,0xC2,0x52},{0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00},{0x02,0x04,0x06,0x0C,0x01,0x03,0x05,0x07}},
+       {{0x76,0xEF,0xEB,0x80,0x52,0x43,0x83,0x57},{0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00},{0x02,0x04,0x06,0x10,0x01,0x03,0x05,0x07}},
+       {{0x1C,0x09,0x8E,0x3B,0x23,0x23,0x52,0xB5},{0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00},{0x02,0x04,0x06,0x18,0x01,0x03,0x05,0x07}},
+       {{0xA9,0x13,0xA2,0xBE,0xCF,0x1A,0xC4,0x9A},{0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00},{0x02,0x04,0x06,0x28,0x01,0x03,0x05,0x07}},
+       {{0x25,0x56,0x4B,0xB0,0xC8,0x2A,0xD4,0x27},{0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00},{0x02,0x04,0x06,0x48,0x01,0x03,0x05,0x07}},
+       {{0xB1,0x04,0x57,0x3F,0xA7,0x16,0x62,0xD4},{0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x03,0x01,0x05,0x07}},
+       {{0x45,0x46,0xED,0xCC,0xE7,0xD3,0x8E,0xA3},{0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x05,0x03,0x01,0x07}},
+       {{0x22,0x6D,0xB5,0x35,0xE0,0x5A,0xE0,0x90},{0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x09,0x03,0x05,0x07}},
+       {{0xB8,0xF5,0xE5,0x44,0xC5,0x98,0x4A,0xBD},{0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x11,0x03,0x05,0x07}},
+       {{0xAC,0x78,0x0A,0x23,0x9E,0xF6,0xBC,0xA0},{0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x21,0x03,0x05,0x07}},
+       {{0x46,0x6B,0x2D,0x70,0x41,0x17,0xBF,0x3D},{0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x41,0x03,0x05,0x07}},
+       {{0x64,0x44,0x24,0x71,0xA2,0x56,0xDF,0xB5},{0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x05,0x03,0x07}},
+       {{0xC4,0x00,0x52,0x24,0xA2,0xD6,0x16,0x7A},{0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x07,0x05,0x03}},
+       {{0xD8,0x4A,0x80,0x1E,0x95,0x5B,0x70,0xC4},{0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x0B,0x05,0x07}},
+       {{0x08,0x56,0x6E,0xB5,0x64,0xD6,0x47,0x4E},{0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x13,0x05,0x07}},
+       {{0x41,0x6F,0xBA,0xA4,0xEB,0xAE,0xA0,0x55},{0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x23,0x05,0x07}},
+       {{0x62,0x9D,0xDE,0x72,0x84,0x4A,0x53,0xD5},{0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x43,0x05,0x07}},
+       {{0x39,0xD3,0x2B,0x66,0xB8,0x08,0x40,0x2E},{0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x07,0x05}},
+       {{0xAF,0x67,0xA9,0x18,0x57,0x21,0xAF,0x8D},{0x00,0x00,0x00,0x20,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x09,0x07}},
+       {{0x34,0xBC,0x9D,0xBC,0xC4,0xC2,0x3B,0xC8},{0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x0D,0x07}},
+       {{0xB6,0x50,0xF9,0x81,0xF6,0xBF,0x90,0x3C},{0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x15,0x07}},
+       {{0x71,0x41,0x93,0xA1,0x59,0x81,0xA5,0x52},{0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x25,0x07}},
+       {{0x6B,0x00,0xBD,0x74,0x1C,0x3C,0xE0,0x1A},{0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x45,0x07}},
+       {{0x76,0xFD,0x0B,0xD0,0x41,0xD2,0x82,0x5D},{0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x09}},
+       {{0xC6,0x3A,0x1C,0x25,0x63,0x5A,0x2F,0x0E},{0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x0B}},
+       {{0xD9,0x0E,0xD7,0x30,0xE2,0xAD,0xA9,0x87},{0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x0F}},
+       {{0x6B,0x81,0xC6,0xD1,0x05,0x09,0x87,0x1E},{0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x17}},
+       {{0xB4,0xA7,0x1E,0x02,0x54,0x37,0x43,0x35},{0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x27}},
+       {{0x45,0x14,0x7C,0x7F,0xE0,0xDE,0x09,0x65},{0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0x47}},
+       {{0x78,0xB0,0xF5,0x20,0x8B,0x7D,0xF3,0xDD},{0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00},{0xFE,0x04,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0x88,0xB3,0x3C,0xE1,0xF7,0x87,0x42,0xA1},{0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0xFC,0x06,0x08,0x01,0x03,0x05,0x07}},
+       {{0x11,0x2F,0xB2,0xF7,0xE2,0xB2,0x4F,0x6E},{0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0xFA,0x08,0x01,0x03,0x05,0x07}},
+       {{0x25,0x56,0x4E,0xC6,0xEB,0x2D,0x74,0x5B},{0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0xF8,0x01,0x03,0x05,0x07}},
+       {{0x7E,0x98,0x37,0xF9,0x80,0x8F,0x09,0x82},{0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0xFF,0x03,0x05,0x07}},
+       {{0xF9,0xB5,0x62,0x3B,0xD8,0x7B,0x3C,0x3F},{0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0xFD,0x05,0x07}},
+       {{0x29,0xC5,0x2B,0xFA,0xD1,0xFC,0x5C,0xC7},{0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0xFB,0x07}},
+       {{0xC1,0xA3,0x09,0x71,0xBD,0x8E,0xAF,0x2F},{0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x06,0x08,0x01,0x03,0x05,0xF9}},
+       {{0xB6,0xDD,0xD1,0xAD,0xAA,0x15,0x6F,0x29},{0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x03,0x05,0x02,0x07,0x04,0x06,0x08}},
+       {{0x65,0x34,0x03,0x19,0x17,0xB3,0xA3,0x96},{0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x01,0x06,0x08,0x03,0x05,0x07}},
+       {{0xF9,0x38,0x43,0x56,0x52,0xE5,0xB1,0xA9},{0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x04,0x06,0x08,0x03,0x05,0x07}},
+
+       {{0xA4,0xA0,0xAF,0xDA,0x48,0xB0,0xA1,0x10},{0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x04,0x06,0x03,0x08,0x05,0x07}},
+       {{0x55,0x15,0x8A,0x0D,0x48,0x29,0x01,0xD8},{0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x02,0x04,0x01,0x06,0x03,0x05,0x08,0x07}},
+       {{0xC4,0x81,0x96,0x7D,0xA3,0xB7,0x73,0x50},{0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x05,0x04,0x06,0x08,0x07}},
+       {{0x36,0x73,0xDF,0xC1,0x1B,0x98,0xA8,0x1D},{0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x04,0x05,0x06,0x08,0x07}},
+       {{0xCE,0xE0,0xB3,0x1B,0x41,0xEB,0x15,0x12},{0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00},{0x01,0x02,0x03,0x04,0x06,0x05,0x08,0x07}},
+       {{0},{0},{0}}
+};
+
+int testKeyDiversificationWithMasterkeyTestcases() {
+       int error = 0;
+       int i;
+       uint8_t empty[8]={0};
+
+       prnlog("[+} Testing encryption/decryption");
+
+       for (i = 0;  memcmp(testcases+i, empty, 8); i++)
+               error += testDES(testcases[i], ctx_enc, ctx_dec);
+
+       if (error)
+               prnlog("[+] %d errors occurred (%d testcases)", error, i);
+       else
+               prnlog("[+] Hashing seems to work (%d testcases)", i);
+       return error;
+}
+
+void print64bits(char*name, uint64_t val) {
+       printf("%s%08x%08x\n",name,(uint32_t) (val >> 32) ,(uint32_t) (val & 0xFFFFFFFF));
+}
+
+uint64_t testCryptedCSN(uint64_t crypted_csn, uint64_t expected)
+{
+       int retval = 0;
+       uint8_t result[8] = {0};
+       if(debug_print) prnlog("debug_print %d", debug_print);
+       if(debug_print) print64bits("    {csn}      ", crypted_csn );
+
+       uint64_t crypted_csn_swapped = swapZvalues(crypted_csn);
+
+       if(debug_print) print64bits("    {csn-revz} ", crypted_csn_swapped);
+
+       hash0(crypted_csn, result);
+    uint64_t resultbyte = x_bytes_to_num(result,8 );
+       if(debug_print) print64bits("    hash0      " , resultbyte );
+
+       if(resultbyte != expected ) {
+               if(debug_print) {
+                       prnlog("\n[+] FAIL!");
+                       print64bits("    expected       " ,  expected );
+               }
+               retval = 1;
+       } else {
+               if (debug_print) prnlog(" [OK]");
+       }
+       return retval;
+}
+
+int testDES2(uint64_t csn, uint64_t expected) {
+       uint8_t result[8] = {0};
+       uint8_t input[8] = {0};
+
+       print64bits("   csn ", csn);
+    x_num_to_bytes(csn, 8,input);
+
+       des_crypt_ecb(&ctx_enc,input, result);
+
+    uint64_t crypt_csn = x_bytes_to_num(result, 8);
+       print64bits("   {csn}    ", crypt_csn );
+       print64bits("   expected ", expected );
+
+       if( expected == crypt_csn ) {
+               prnlog("[+] OK");
+               return 0;
+       } else {
+               return 1;
+       }
+}
+
+/**
+ * These testcases come from http://www.proxmark.org/forum/viewtopic.php?pid=10977#p10977
+ * @brief doTestsWithKnownInputs
+ * @return
+ */
+int doTestsWithKnownInputs() {
+       // KSel from http://www.proxmark.org/forum/viewtopic.php?pid=10977#p10977
+       int errors = 0;
+       prnlog("[+] Testing DES encryption");
+       uint8_t key[8] = {0x6c,0x8d,0x44,0xf9,0x2a,0x2d,0x01,0xbf};
+
+       des_setkey_enc( &ctx_enc, key);
+       testDES2(0xbbbbaaaabbbbeeee,0xd6ad3ca619659e6b);
+
+       prnlog("[+] Testing hashing algorithm");
+
+       errors += testCryptedCSN(0x0102030405060708,0x0bdd6512073c460a);
+       errors += testCryptedCSN(0x1020304050607080,0x0208211405f3381f);
+       errors += testCryptedCSN(0x1122334455667788,0x2bee256d40ac1f3a);
+       errors += testCryptedCSN(0xabcdabcdabcdabcd,0xa91c9ec66f7da592);
+       errors += testCryptedCSN(0xbcdabcdabcdabcda,0x79ca5796a474e19b);
+       errors += testCryptedCSN(0xcdabcdabcdabcdab,0xa8901b9f7ec76da4);
+       errors += testCryptedCSN(0xdabcdabcdabcdabc,0x357aa8e0979a5b8d);
+       errors += testCryptedCSN(0x21ba6565071f9299,0x34e80f88d5cf39ea);
+       errors += testCryptedCSN(0x14e2adfc5bb7e134,0x6ac90c6508bd9ea3);
+
+       if (errors)
+               prnlog("[+] %d errors occurred (9 testcases)", errors);
+       else
+               prnlog("[+] Hashing seems to work (9 testcases)" );
+       return errors;
+}
+
+int readKeyFile(uint8_t key[8]) {
+       int retval = 1;
+       FILE *f = fopen("iclass_key.bin", "rb");
+       if (!f)
+               return 0;
+       
+       size_t bytes_read = fread(key, sizeof(uint8_t), 8, f);
+       if ( bytes_read == 1)
+               retval = 0;     
+
+       if (f)
+               fclose(f);
+       return retval;
+}
+
+
+int doKeyTests(uint8_t debuglevel)
+{
+       debug_print = debuglevel;
+
+       prnlog("[+] Checking if the master key is present (iclass_key.bin)...");
+       uint8_t key[8] = {0};
+       if (readKeyFile(key)) {
+               prnlog("[+] Master key not present, will not be able to do all testcases");
+       } else {
+
+               //Test if it's the right key...
+               uint8_t i;
+               uint8_t j = 0;
+               for (i = 0; i < sizeof(key); i++)
+                       j += key[i];
+               
+               if (j != 185) {
+                       prnlog("[+] A key was loaded, but it does not seem to be the correct one. Aborting these tests");
+               } else {
+                       prnlog("[+] Key present");
+                       prnlog("[+] Checking key parity...");
+                       des_checkParity(key);
+                       des_setkey_enc( &ctx_enc, key);
+                       des_setkey_dec( &ctx_dec, key);
+                       // Test hashing functions
+                       prnlog("[+] The following tests require the correct 8-byte master key");
+                       testKeyDiversificationWithMasterkeyTestcases();
+               }
+       }
+       prnlog("[+] Testing key diversification with non-sensitive keys...");
+       doTestsWithKnownInputs();
+       return 0;
+}
+
+/**
+
+void checkParity2(uint8_t* key)

 {
 {

+
+       uint8_t stored_parity = key[7];
+       printf("Parity byte: 0x%02x\n", stored_parity);

        int i;
        int i;

+       int byte;

        int fails =0;
        int fails =0;

-       for(i =0 ; i < 8 ; i++)
+       BitstreamIn bits = {key, 56, 0};
+
+       bool parity = 0;
+
+       for(i =0 ; i  < 56; i++)

        {
        {

-               bool parity = des_getParityBitFromKey(key[i]);
-               if(parity != (key[i] & 0x1))
+
+               if ( i > 0 && i % 7 == 0)

                {
                {

-                       fails++;
-                       printf("parity1 fail, byte %d [%02x] was %d, should be %d\n",i,key[i],(key[i] & 0x1),parity);
+                       parity = !parity;
+                       bool pbit = stored_parity & (0x80 >> (byte));
+                       if(parity != pbit)
+                       {
+                               printf("parity2 fail byte %d, should be %d, was %d\n", (i / 7), parity, pbit);
+                               fails++;
+                       }
+                       parity =0 ;
+                       byte = i / 7;

                }
                }

+               parity = parity ^ headBit(&bits);

        }
        if(fails)
        {
        }
        if(fails)
        {

-               printf("parity fails: %d\n", fails);
+               printf("parity2 fails: %d\n", fails);

        }else
        {
        }else
        {

-               printf("Key syntax is with parity bits inside each byte\n");
+               printf("Key syntax is with parity bits grouped in the last byte!\n");

        }
 }
        }
 }

-
-void printarr2(char * name, uint8_t* arr, int len)
+void modifyKey_put_parity_last(uint8_t * key, uint8_t* output)

 {
 {

-       int i ;
-       printf("%s :", name);
-       for(i =0 ;  i< len ; i++)
+       uint8_t paritybits = 0;
+       bool parity =0;
+       BitstreamOut out = { output, 0,0};
+       unsigned int bbyte, bbit;
+       for(bbyte=0; bbyte <8 ; bbyte++ )

        {
        {

-               printf("%02x",*(arr+i));
+               for(bbit =0 ; bbit< 7 ; bbit++)
+               {
+                       bool bit = *(key+bbyte) & (1 << (7-bbit));
+                       pushBit(&out,bit);
+                       parity ^= bit;
+               }
+               bool paritybit = *(key+bbyte) & 1;
+               paritybits |= paritybit << (7-bbyte);
+               parity = 0;
+

        }
        }

-       printf("\n");
+       output[7] = paritybits;
+       printf("Parity byte: %02x\n", paritybits);
+}
+
+ * @brief Modifies a key with parity bits last, so that it is formed with parity
+ *             bits inside each byte
+ * @param key
+ * @param output
+
+void modifyKey_put_parity_allover(uint8_t * key, uint8_t* output)
+{
+       bool parity =0;
+       BitstreamOut out = { output, 0,0};
+       BitstreamIn in = {key, 0,0};
+       unsigned int bbyte, bbit;
+       for(bbit =0 ; bbit < 56 ; bbit++) {
+               if( bbit > 0 && bbit % 7 == 0) {
+                       pushBit(&out,!parity);
+                       parity = 0;
+               }
+               bool bit = headBit(&in);
+               pushBit(&out,bit );
+               parity ^= bit;
+       }
+       pushBit(&out, !parity);
+
+       if(     des_key_check_key_parity(output))
+               printf("modifyKey_put_parity_allover fail, DES key invalid parity!");

 }
 }

+*/
+
+