From c24b5ee75e97b079c575c20a203af868fd6ed5f3 Mon Sep 17 00:00:00 2001
From: Simon Freiermuth <simon.freiermuth1@students.fhnw.ch>
Date: Thu, 17 Mar 2022 15:32:27 +0100
Subject: [PATCH] =?UTF-8?q?Bit=20Flipper=202:=20A=20new=20hope=20oder=20so?=
 =?UTF-8?q?=20=E2=AD=90=F0=9F=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/main/ch/fhnw/kry/SPN.class     | Bin 2246 -> 2277 bytes
 src/main/java/ch/fhnw/kry/SPN.java |  17 +++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/bin/main/ch/fhnw/kry/SPN.class b/bin/main/ch/fhnw/kry/SPN.class
index 317df834b8e04d0d149ee6497600ddb0998a37c3..335e3cb705e01fc2a41a73ac7b71759ecff45081 100644
GIT binary patch
delta 229
zcmX|*Jq`g;6ot>2`wSBalX%rLiE5B2nM!2*1>?8XTZ9UG(Aj{3!YZu625dktab_f%
zlkc8;@5y<1FYo?#4o?WO0AeGhVr9GAhmw$=kkWF7V_zT=idKK7pI#(p`V=ao<=8P=
zQEp7L5l{o<sXe&pql_V{7@>(V+L)k=7z4~U#5HO>>;7t>js_<dLW_=-(wvk@X+g3X
b7-2~g#)ept6sFu4ARqXa6<Ka{y5`Im0U#aL

delta 198
zcmaDVcua7^C-(ZC3@i+63=9lb(kue}GAR{xvl!T!mou=in6ZFFWRXQ!MOh%Syf7)I
zIveISK;6s?YCuv5Xchy5Ban7tP+@RkuwZa!PzQ?GL2O{qV9*5efOavM07V!<EGq^d
zAd?9!=nG^q12t<f_yJigKqJH${DCZ122Y^8AOjn}1LGeC0Y(tX#ppTt6o)hb7EBs?

diff --git a/src/main/java/ch/fhnw/kry/SPN.java b/src/main/java/ch/fhnw/kry/SPN.java
index a4a31db..b17ea73 100644
--- a/src/main/java/ch/fhnw/kry/SPN.java
+++ b/src/main/java/ch/fhnw/kry/SPN.java
@@ -62,13 +62,22 @@ public class SPN {
     }
 
     public int swapBits(int x, int a, int b) {
-        int tmpA = (x & (0x1 << 15 - a)) == 0 ? 0 : 1;
-        int tmpB = (x & (0x1 << 15 - b)) == 0 ? 0 : 1;
+        int tmpA = (x & (0x1 << (15 - a)));
+        int tmpB = (x & (0x1 << (15 - b)));
+        
+        tmpA = tmpA == 0 ? 0 : 1;
+        tmpB = tmpB == 0 ? 0 : 1;
 
-        x = tmpA == 0 ? (x & 0x1 << 15 - b) & 0b0 : (x & 0x1 << 15 - b) & ~0b0;
+        tmpA = tmpA << (15 -b);
+        tmpB = tmpB << (15 - a);
 
+        x = x | tmpA;
+        x = x | tmpB;
 
-        return 0;
+        // x = tmpA == 0 ? (x & 0x1 << 15 - b) | 0b0 : (x & 0x1 << 15 - b) | ~0b0;
+        // x = tmpB == 0 ? (x & 0x1 << 15 - a) | 0b0 : (x & 0x1 << 15 - a) | ~0b0;
+
+        return x;
     }
 
 }