X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/blobdiff_plain/1bae5007d1fabd3147e642352fac765684a7aad6..70b995d30a4c75869c4223dbb931802246f52d94:/OneRoundIoT/OneRound/one_round_par2.cpp?ds=sidebyside

diff --git a/OneRoundIoT/OneRound/one_round_par2.cpp b/OneRoundIoT/OneRound/one_round_par2.cpp
index efa6969..4a069b4 100644
--- a/OneRoundIoT/OneRound/one_round_par2.cpp
+++ b/OneRoundIoT/OneRound/one_round_par2.cpp
@@ -166,10 +166,13 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
 
     uchar X[h2];
 
-    for(int a=0;a<h2;a++) {
-      X[a]=Sbox1[(a+10*id)&0xFF];           //Warning according to the size of h2, we can be outsize of Sbox1[a]
-    }
 
+    for(int a=0;a<h2;a+=4) {
+     X[a]=Sbox1[a&0xFF];           //Warning according to the size of h2, we can be outsize of Sbox1[a]
+     X[a+1]=Sbox1[(a+1)&0xFF];
+     X[a+2]=Sbox1[(a+2)&0xFF];
+     X[a+3]=Sbox1[(a+3)&0xFF];           
+   }
 
     
     int offset=p*loc_len;
@@ -191,72 +194,36 @@ 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){
-	fX[a]=X[a];
-	fX[a+1]=X[a+1];
-	fX[a+2]=X[a+2];
-	fX[a+3]=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]^RM2[a];
+	fX[a+1]=X[a+1]^RM2[a+1];
+	fX[a+2]=X[a+2]^RM2[a+2];
+	fX[a+3]=X[a+3]^RM2[a+3];
+      }
     
-      /*   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]];
 	fX[a+1]=Sbox2[fX[a+1]];
 	fX[a+2]=Sbox2[fX[a+2]];
 	fX[a+3]=Sbox2[fX[a+3]];
-      }
+	}*/
 
 //    rotate(RM1, &RM2[id*h2], h2, Pbox[it]%h2);
     
-      for(int a=0;a<h2;a+=4) {
-	RM2[a]=RM2[PboxRM[a]];
-	RM2[a+1]=RM2[PboxRM[a+1]];
-	RM2[a+2]=RM2[PboxRM[a+2]];
-	RM2[a+3]=RM2[PboxRM[a+3]];
-      }
     
-      for(int a=0;a<h2;a+=4) {
-	fX[a]=fX[a]^RM2[a];
-	fX[a+1]=fX[a+1]^RM2[a+1];
-	fX[a+2]=fX[a+2]^RM2[a+2];
-	fX[a+3]=fX[a+3]^RM2[a+3];
-      }
+    
+     
 
 
     
@@ -274,7 +241,17 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
 	seq_out[ind1+a+2]=fX[a+2];
 	seq_out[ind1+a+3]=fX[a+3];
       }
-    
+
+
+
+      for(int a=0;a<h2;a+=4) {
+	RM2[a]=RM2[PboxRM[a]];
+	RM2[a+1]=RM2[PboxRM[a+1]];
+	RM2[a+2]=RM2[PboxRM[a+2]];
+	RM2[a+3]=RM2[PboxRM[a+3]];
+      }
+
+      
       /*for(int a=0;a<h2;a+=4) {
 	RM1[id*h2+a]=RM1[id*h2+PboxRM[a]];
 	RM1[id*h2+a+1]=RM1[id*h2+PboxRM[a+1]];