Refactor in permutation

Author: gefeili

core/src/main/java/org/bouncycastle/crypto/engines/AsconPermutationFriend.java

@@ -33,14 +33,14 @@ public void round(long C)
             //long x0x2c = x0 ^ x2;
             long x1x2c = x1 ^ x2;
 
-            //long t0 = x0 ^ x1x2c ^ x3 ^ (x1 & (x0x4 ^ x2));
-            long t0 = x0 ^ x2 ^ x3 ^ (x1 & ~(x0x4 ^ x2));
-            long t1 = x0x4 ^ x2 ^ x3 ^ (x1x2c & (x1 ^ x3));
-            //long t1 = x0x4 ^ x2 ^ x3 ^ (x1 & ~(x2 | x3));
+            long t0 = x3 ^ (x1 | x2) ^ x0 ^ (x1 & x0x4);
+            //long t1 = x0x4 ^ x2 ^ x3 ^ (x1x2c & (x1 ^ x3));
+            long t1 = x0x4 ^ (x1 | x2 | x3) ^ (x1 & x2 & x3);
             long t2 = x1x2c ^ (x4 & (~x3));//x4 ^ (x3 & x4);
             //long t3 = x0 ^ x1x2c ^ ((~x0) & (x3 ^ x4));
             long t3 = (x0 | (x3 ^ x4)) ^ x1x2c;
-            long t4 = x1 ^ x3 ^ x4 ^ (x0x4 & x1);
+            //long t4 = x1 ^ x3 ^ x4 ^ (x0x4 & x1);
+            long t4 = x3 ^ (x1 | x4) ^ (x0 & x1);
             x0 = t0 ^ Longs.rotateRight(t0, 19) ^ Longs.rotateRight(t0, 28);
             x1 = t1 ^ Longs.rotateRight(t1, 39) ^ Longs.rotateRight(t1, 61);
             x2 = ~(t2 ^ Longs.rotateRight(t2, 1) ^ Longs.rotateRight(t2, 6));