From 696a03b79ed936131f6e76a73aef69a46a704582 Mon Sep 17 00:00:00 2001
From: couturie <couturie@extinction>
Date: Wed, 13 Sep 2017 18:44:34 +0200
Subject: [PATCH] new

---
 OneRoundIoT/OneRound/one_round_new.cpp  | 22 +++++++-------
 OneRoundIoT/OneRound/one_round_par2.cpp | 39 +++++--------------------
 2 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index 2637e31..e7b98ae 100644
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -163,14 +163,13 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
     }
        
 
-
-    /*for(int a=0;a<h2;a+=4){
-      fX[a]=RM1[X[a]];
-      fX[a+1]=RM1[X[a+1]];
-      fX[a+2]=RM1[X[a+2]];
-      fX[a+3]=RM1[X[a+3]];
-      }*/
-
+    for(int a=0;a<h2;a+=4) {
+      X[a]=X[Sbox1[a]];
+      X[a+1]=X[Sbox1[a+1]];
+      X[a+2]=X[Sbox1[a+2]];
+      X[a+3]=X[Sbox1[a+3]];
+    }
+    
     for(int a=0;a<h2;a+=4){
       fX[a]=X[a];
       fX[a+1]=X[a+1];
@@ -180,7 +179,7 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
 
 
     
-    *(int*)&fX[0]^=it;
+//    *(int*)&fX[0]^=it;
 
 
 /*    for(int a=0;a<h2;a+=16) {
@@ -188,9 +187,10 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
       *(int*)&fX[a+4]^=it;
       *(int*)&fX[a+8]^=it;
       *(int*)&fX[a+12]^=it;
-    }
-*/  
+    }  
+*/
 
+    
     for(int a=0;a<h2;a+=4) {
       fX[a]=fX[a]^RM1[a];
       fX[a+1]=fX[a+1]^RM1[a+1];
diff --git a/OneRoundIoT/OneRound/one_round_par2.cpp b/OneRoundIoT/OneRound/one_round_par2.cpp
index efa6969..057887c 100644
--- a/OneRoundIoT/OneRound/one_round_par2.cpp
+++ b/OneRoundIoT/OneRound/one_round_par2.cpp
@@ -191,12 +191,12 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
       }
   
 
-      /*for(int a=0;a<h2;a+=4){
-	fX[a]=RM1[X[a]];
-	fX[a+1]=RM1[X[a+1]];
-	fX[a+2]=RM1[X[a+2]];
-	fX[a+3]=RM1[X[a+3]];
-	}*/
+      for(int a=0;a<h2;a+=4) {
+	X[a]=X[Sbox1[a]];
+	X[a+1]=X[Sbox1[a+1]];
+	X[a+2]=X[Sbox1[a+2]];
+	X[a+3]=X[Sbox1[a+3]];
+      }
 
       for(int a=0;a<h2;a+=4){
 	fX[a]=X[a];
@@ -207,33 +207,10 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
 
 
 
+      
+     
     
-      /*   if(it<513) {
-	   for(int a=0;a<h2;a++)
-	   printf("%d ",fX[a]);
-	   printf("\n");
-	   }*/
     
-      *(int*)&fX[0]^=it;
-
-      /* if(it<513) {
-	 for(int a=0;a<h2;a++)
-	 printf("%d ",fX[a]);
-	 printf("\n");
-	 }*/
-
-
-  
-    
-      /*for(int a=0;a<h2;a+=4) {
-	fX[id*h2+a]=fX[id*h2+a]^RM1[id*h2+a];
-	fX[id*h2+a+1]=fX[id*h2+a+1]^RM1[id*h2+a+1];
-	fX[id*h2+a+2]=fX[id*h2+a+2]^RM1[id*h2+a+2];
-	fX[id*h2+a+3]=fX[id*h2+a+3]^RM1[id*h2+a+3];
-	}*/
-
-
-
     
       for(int a=0;a<h2;a+=4) {
 	fX[a]=Sbox2[fX[a]];
-- 
2.39.5