From d98f8e96f45bba6a0513ab72261db37f1e4f818f Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 28 Apr 2020 13:28:29 +0200
Subject: [PATCH] chg: hf iclass loclass - use defines, cppchecker happy

---
 client/src/loclass/cipher.c | 53 ++++++++++++++++++++++++++++++-------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/client/src/loclass/cipher.c b/client/src/loclass/cipher.c
index 13f686b51..af5d4f3a3 100644
--- a/client/src/loclass/cipher.c
+++ b/client/src/loclass/cipher.c
@@ -68,6 +68,7 @@ typedef struct {
 *  T (x 0 x 1 . . . . . . x 15 ) = x 0 ⊕ x 1 ⊕ x 5 ⊕ x 7 ⊕ x 10 ⊕ x 11 ⊕ x 14 ⊕ x 15 .
 **/
 static bool T(State state) {
+/*
     bool x0 = state.t & 0x8000;
     bool x1 = state.t & 0x4000;
     bool x5 = state.t & 0x0400;
@@ -77,19 +78,33 @@ static bool T(State state) {
     bool x14 = state.t & 0x0002;
     bool x15 = state.t & 0x0001;
     return x0 ^ x1 ^ x5 ^ x7 ^ x10 ^ x11 ^ x14 ^ x15;
+*/
+#define  _x0  ((state.t & 0x8000) >> 15 )
+#define  _x1  ((state.t & 0x4000) >> 14 )
+#define  _x5  ((state.t & 0x0400) >> 10 )
+#define  _x7  ((state.t & 0x0100) >> 8 )
+#define  _x10 ((state.t & 0x0020) >> 5 )
+#define  _x11 ((state.t & 0x0010) >> 4 )
+#define  _x14 ((state.t & 0x0002) >> 1 )
+#define  _x15 (state.t & 0x0001) 
+    return (_x0) ^ (_x1) ^ (_x5) ^ (_x7) ^ (_x10) ^ (_x11) ^ (_x14) ^ (_x15);
 }
 /**
 *  Similarly, the feedback function for the bottom register B : F 8/2 → F 2 is defined as
 *  B(x 0 x 1 . . . x 7 ) = x 1 ⊕ x 2 ⊕ x 3 ⊕ x 7 .
 **/
-static bool B(State state) {
+/*static bool B(State state) {
     bool x1 = state.b & 0x40;
     bool x2 = state.b & 0x20;
     bool x3 = state.b & 0x10;
     bool x7 = state.b & 0x01;
     return x1 ^ x2 ^ x3 ^ x7;
 }
+*/
+#define B(x) (((x.b & 0x40) >> 6)  ^ ((x.b & 0x20) >> 5) ^ ((x.b & 0x10) >> 4) ^ (x.b & 0x01))
 
+//   12 3456
+// 0100 0000
 
 /**
 *  Definition 3 (Selection function). The selection function select : F 2 × F 2 ×
@@ -99,14 +114,28 @@ static bool B(State state) {
 *  z 2 = (r 3 ∧ r 5 ) ⊕ (r 4 ∧ r 6 ) ⊕ r 7 ⊕ x
 **/
 static uint8_t _select(bool x, bool y, uint8_t r) {
-    bool r0 = r >> 7 & 0x1;
-    bool r1 = r >> 6 & 0x1;
-    bool r2 = r >> 5 & 0x1;
-    bool r3 = r >> 4 & 0x1;
-    bool r4 = r >> 3 & 0x1;
-    bool r5 = r >> 2 & 0x1;
-    bool r6 = r >> 1 & 0x1;
-    bool r7 = r & 0x1;
+ #define _r0 ((r >> 7) & 0x01)
+ #define _r1 ((r >> 6) & 0x01)
+ #define _r2 ((r >> 5) & 0x01)
+ #define _r3 ((r >> 4) & 0x01)
+ #define _r4 ((r >> 3) & 0x01)
+ #define _r5 ((r >> 2) & 0x01)
+ #define _r6 ((r >> 1) & 0x01)
+ #define _r7 (r & 0x01)
+
+ #define _z0  ( (_r0 & _r2) ^ ( _r1 & (!_r3)) ^ (_r2 | _r4) )
+ #define _z1  ( (_r0 | _r2) ^ ( _r5 | _r7) ^_r1 ^ _r6 ^ x ^ y )
+ #define _z2  ( (_r3 & (!_r5)) ^ (_r4 & _r6) ^ _r7 ^ x )
+
+/*
+    uint8_t r0 = r >> 7 & 0x1;
+    uint8_t r1 = r >> 6 & 0x1;
+    uint8_t r2 = r >> 5 & 0x1;
+    uint8_t r3 = r >> 4 & 0x1;
+    uint8_t r4 = r >> 3 & 0x1;
+    uint8_t r5 = r >> 2 & 0x1;
+    uint8_t r6 = r >> 1 & 0x1;
+    uint8_t r7 = r & 0x1;
 
     bool z0 = (r0 & r2) ^ (r1 & (!r3)) ^ (r2 | r4);
     bool z1 = (r0 | r2) ^ (r5 | r7) ^ r1 ^ r6 ^ x ^ y;
@@ -115,6 +144,11 @@ static uint8_t _select(bool x, bool y, uint8_t r) {
     // The three bitz z0.. z1 are packed into a uint8_t:
     // 00000ZZZ
     //Return value is a uint8_t
+    return ((z0 << 2) & 4) | ((z1 << 1) & 2) | (z2 & 1);
+*/
+   return  ((_z0 << 2) & 4) | ((_z1 << 1) & 2) | (_z2 & 1);
+
+/*
     uint8_t retval = 0;
     retval |= (z0 << 2) & 4;
     retval |= (z1 << 1) & 2;
@@ -122,6 +156,7 @@ static uint8_t _select(bool x, bool y, uint8_t r) {
 
     // Return value 0 <= retval <= 7
     return retval;
+*/
 }
 
 /**