From: couturie <you@example.com>
Date: Sun, 22 Jul 2018 13:37:43 +0000 (+0200)
Subject: update of one round
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/commitdiff_plain/1c5994c77784086a9fc557f039afc3c03847e249?ds=sidebyside;hp=ea3a860bdf36f8e078162f3ef955b90e5d885ad5

update of one round
---

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index d4441a9..b936005 100644
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -61,6 +61,16 @@ double TimeStop(double t)
 
 
 
+uint xorshift32(const uint t)
+{
+  /* Algorithm "xor" from p. 4 of Marsaglia, "Xorshift RNGs" */
+  uint x = t;
+  x ^= x << 13;
+  x ^= x >> 17;
+  x ^= x << 5;
+  return x;
+}
+
 
 
 void inverse_tables(uchar *tab, int size_tab,uchar *inv_perm_tabs) {
@@ -137,26 +147,26 @@ void prga(uchar *sc, int ldata, uchar *r) {
 
 
 
-template<int h2>
-void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, int enc) {
 
+template<int h2>
+void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, uint myrand,int enc) {
 
-//  uchar *X=new uchar[h2];
-//  uchar *fX=new uchar[h2];
+  
   uchar X[h2];
   uchar fX[h2];
-  
+
   int ind1,ind2;
 
   
-   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];           
-   }
-
-   
+
+  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];
+  }
+
+
   for(int it=0;it<len;it++) {
     if(enc) {
       ind1=it*h2;
@@ -166,7 +176,7 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
       ind2=it*h2;
       ind1=Pbox[it]*h2;
     }
-       
+
 
     for(int a=0;a<h2;a+=4) {
       X[a]=Sbox1[X[a]];
@@ -174,21 +184,7 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
       X[a+2]=Sbox1[X[a+2]];
       X[a+3]=Sbox1[X[a+3]];
     }
-   
-
-    
-//    *(int*)&fX[0]^=it;
-
-
-/*    for(int a=0;a<h2;a+=16) {
-      *(int*)&fX[a]^=it;
-      *(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]=X[a]^RM1[a];
       fX[a+1]=X[a+1]^RM1[a+1];
@@ -196,29 +192,28 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
       fX[a+3]=X[a+3]^RM1[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]];
-      }*/
-    
-     for(int a=0;a<h2;a+=4) {
-      fX[a]=fX[a]^seq_in[ind2+a];
-      fX[a+1]=fX[a+1]^seq_in[ind2+a+1];
-      fX[a+2]=fX[a+2]^seq_in[ind2+a+2];
-      fX[a+3]=fX[a+3]^seq_in[ind2+a+3];
+    for(int a=0;a<h2;a+=4) {
+
+      myrand=xorshift32(myrand);
+      uint mm=myrand;
+
+      fX[a]=fX[a]^seq_in[ind2+a]^(mm&255);
+      mm>>=8;
+      fX[a+1]=fX[a+1]^seq_in[ind2+a+1]^(mm&255);
+      mm>>=8;
+      fX[a+2]=fX[a+2]^seq_in[ind2+a+2]^(mm&255);
+      mm>>=8;
+      fX[a+3]=fX[a+3]^seq_in[ind2+a+3]^(mm&255);
     }
 
- 
+
     for(int a=0;a<h2;a+=4) {
       seq_out[ind1+a]=fX[a];
       seq_out[ind1+a+1]=fX[a+1];
       seq_out[ind1+a+2]=fX[a+2];
       seq_out[ind1+a+3]=fX[a+3];
     }
-    
+
     for(int a=0;a<h2;a+=4) {
       RM1[a]=RM1[PboxRM[a]];
       RM1[a+1]=RM1[PboxRM[a+1]];
@@ -227,7 +222,7 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
     }
 
 
-    
+
   }
 
 
@@ -235,29 +230,27 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
 
 
 template<int h2>
-void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, int debug) {
+void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1, int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, uint myrand, int debug) {
 
-
-/*  uchar *X=new uchar[h2];
-  uchar *fX=new uchar[h2];
-  unsigned int *lX=(unsigned int*)X;
-  unsigned int *lseq_in=(unsigned int*)seq_in;
-*/
   uchar X[h2];
   uchar fX[h2];
-//  unsigned int *lX=(unsigned int*)X;
-//  unsigned int *lseq_in=(unsigned int*)seq_in;
-  
+
 
   for(int it=0;it<len;it++) {
     int ind1=it*h2;
     int ind2=Pbox[it]*h2;
 
     for(int a=0;a<h2;a+=4) {
-      X[a]=seq_in[ind2+a];
-      X[a+1]=seq_in[ind2+a+1];
-      X[a+2]=seq_in[ind2+a+2];
-      X[a+3]=seq_in[ind2+a+3];
+      myrand=xorshift32(myrand);
+
+      uint mm=myrand;
+      X[a]=seq_in[ind2+a]^(mm&255);
+      mm>>=8;
+      X[a+1]=seq_in[ind2+a+1]^(mm&255);
+      mm>>=8;
+      X[a+2]=seq_in[ind2+a+2]^(mm&255);
+      mm>>=8;
+      X[a+3]=seq_in[ind2+a+3]^(mm&255);
     }
 
     for(int a=0;a<h2;a+=4){
@@ -295,20 +288,25 @@ void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
   }
 
 
+  
+
 
 
 }
 
 
+
+
+
+
+
+
 template<int h2>
-void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Inv_Sbox1, uchar *Inv_Sbox2, int debug) {
+void decrypt(uchar* seq_in, uchar *seq_out, int len, uchar* RM1, int *Pbox, int *PboxRM, uchar *Inv_Sbox1, uchar *Inv_Sbox2,  uint myrand, int debug) {
 
 
-  /*uchar *fX=new uchar[h2];
-  uchar *Inv_Sbox1=new uchar[256];
-  uchar *Inv_Sbox2=new uchar[256];
-  */
-  uchar fX[h2];
+
+ uchar fX[h2];
 
 
 
@@ -325,7 +323,7 @@ void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
       fX[a+1]=seq_in[ind1+a+1];
       fX[a+2]=seq_in[ind1+a+2];
       fX[a+3]=seq_in[ind1+a+3];
-	    
+
     }
     for(int a=0;a<h2;a+=4) {
       fX[a]=Inv_Sbox2[fX[a]];
@@ -346,18 +344,25 @@ void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
       RM1[a+2]=RM1[PboxRM[a+2]];
       RM1[a+3]=RM1[PboxRM[a+3]];
     }
-    
+
     for(int a=0;a<h2;a+=4) {
-      seq_out[ind2+a]=Inv_Sbox1[fX[a]];
-      seq_out[ind2+a+1]=Inv_Sbox1[fX[a+1]];
-      seq_out[ind2+a+2]=Inv_Sbox1[fX[a+2]];
-      seq_out[ind2+a+3]=Inv_Sbox1[fX[a+3]];
+      myrand=xorshift32(myrand);
+
+      uint mm=myrand;
+      seq_out[ind2+a]=Inv_Sbox1[fX[a]]^(mm&255);
+      mm>>=8;
+      seq_out[ind2+a+1]=Inv_Sbox1[fX[a+1]]^(mm&255);
+      mm>>=8;
+      seq_out[ind2+a+2]=Inv_Sbox1[fX[a+2]]^(mm&255);
+      mm>>=8;
+      seq_out[ind2+a+3]=Inv_Sbox1[fX[a+3]]^(mm&255);
     }
 
-     
+
   }
 
 
+
 }
 
 
@@ -503,9 +508,11 @@ int main(int argc, char** argv) {
   uchar Inv_Sbox2[256];
   uchar sc[256];  
   uchar RM1[h2];
-  uchar RM2[h2];
+  uchar RM1_copy[h2];
+  uchar RMtmp[h2];
 
 
+  uint myrand=0;
 
 
   double time_encrypt=0;
@@ -534,16 +541,20 @@ int main(int argc, char** argv) {
 
 
 
+  myrand=0;
+  for(int i=0;i<32;i++) {
+    myrand|=DK[i]&1;
+    myrand<<=1;
+  }
+  uint myrand_copy=myrand;
 
-
-
-
+ 
 
 
 
   
   for(int i=0;i<h2;i++){
-    RM2[i]=RM1[i];
+    RM1_copy[i]=RM1[i];
   }
 
   
@@ -563,9 +574,9 @@ int main(int argc, char** argv) {
     for(i=0;i<nb_test;i++)
     {
       if(ctr)
-	encrypt_ctr<4*4>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+	encrypt_ctr<4*4>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
       else
-	encrypt<4*4>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt<4*4>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       
     }
     break;
@@ -573,9 +584,9 @@ int main(int argc, char** argv) {
     for(i=0;i<nb_test;i++)
     {
       if(ctr)
-	encrypt_ctr<8*8>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+	encrypt_ctr<8*8>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
       else
-	encrypt<8*8>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt<8*8>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       
     }
     break;
@@ -583,9 +594,9 @@ int main(int argc, char** argv) {
     for(i=0;i<nb_test;i++)
     {
       if(ctr)
-	encrypt_ctr<16*16>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+	encrypt_ctr<16*16>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
       else
-	encrypt<16*16>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt<16*16>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       
     }
     break;
@@ -593,9 +604,9 @@ int main(int argc, char** argv) {
     for(i=0;i<nb_test;i++)
     {
       if(ctr)
-	encrypt_ctr<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+	encrypt_ctr<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
       else
-	encrypt<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       
     }
     break;
@@ -603,9 +614,9 @@ int main(int argc, char** argv) {
     for(i=0;i<nb_test;i++)
     {
       if(ctr)
-	encrypt_ctr<64*64>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+	encrypt_ctr<64*64>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
       else
-	encrypt<64*64>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt<64*64>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       
     }
     break;
@@ -613,9 +624,9 @@ int main(int argc, char** argv) {
     for(i=0;i<nb_test;i++)
     {
       if(ctr)
-	encrypt_ctr<128*128>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+	encrypt_ctr<128*128>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,1);
       else
-	encrypt<128*128>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt<128*128>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       
     }
     break;
@@ -641,49 +652,49 @@ int main(int argc, char** argv) {
   case 4:
     for(i=0;i<nb_test;i++) {
       if(ctr)
-	encrypt_ctr<4*4>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt_ctr<4*4>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       else
-	decrypt<4*4>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
+	decrypt<4*4>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,myrand,0);
     }
     break;
   case 8:
     for(i=0;i<nb_test;i++) {
       if(ctr)
-	encrypt_ctr<8*8>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt_ctr<8*8>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       else
-	decrypt<8*8>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
+	decrypt<8*8>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,myrand,0);
     }
     break;
   case 16:
     for(i=0;i<nb_test;i++) {
       if(ctr)
-	encrypt_ctr<16*16>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt_ctr<16*16>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       else
-	decrypt<16*16>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
+	decrypt<16*16>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,myrand,0);
     }
     break;
   case 32:
     for(i=0;i<nb_test;i++) {
       if(ctr)
-	encrypt_ctr<32*32>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt_ctr<32*32>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       else
-	decrypt<32*32>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
+	decrypt<32*32>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,myrand,0);
     }
     break;
   case 64:
     for(i=0;i<nb_test;i++) {
       if(ctr)
-	encrypt_ctr<64*64>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt_ctr<64*64>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       else
-	decrypt<64*64>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
+	decrypt<64*64>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,myrand,0);
     }
     break;
   case 128:
     for(i=0;i<nb_test;i++) {
       if(ctr)
-	encrypt_ctr<128*128>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+	encrypt_ctr<128*128>(seq2, seq,len,RM1_copy,Pbox,PboxRM,Sbox1,Sbox2,myrand,0);
       else
-	decrypt<128*128>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
+	decrypt<128*128>(seq2,seq,len,RM1_copy,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,myrand,0);
     }
     break;
   }