add old one round version

[Cipher_code.git] / OneRoundIoT / OneRound / one_round_new.cpp

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index 9c58017ff97eec8e0c02d72273ce52cbfbe6fb00..be38534e2b865310957a7877e6fe942e46800315 100644 (file)
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -147,8 +147,11 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
   int ind1,ind2;
 
   
   int ind1,ind2;
 
   

-   for(int a=0;a<h2;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]=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];           

    }
 
    
    }
 
    


@@ -163,49 +166,41 @@ 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]=Sbox1[X[a]];
+      X[a+1]=Sbox1[X[a+1]];
+      X[a+2]=Sbox1[X[a+2]];
+      X[a+3]=Sbox1[X[a+3]];

     }
     }

+   

 
 

-    /*   if(it<513) {
-      for(int a=0;a<h2;a++)
-       printf("%d ",fX[a]);
-      printf("\n");
-      }*/

     
     

-    *(int*)&fX[0]^=it;
+//    *(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+=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) {
     for(int a=0;a<h2;a+=4) {

-      fX[a]=fX[a]^RM1[a];
-      fX[a+1]=fX[a+1]^RM1[a+1];
-      fX[a+2]=fX[a+2]^RM1[a+2];
-      fX[a+3]=fX[a+3]^RM1[a+3];
+      fX[a]=X[a]^RM1[a];
+      fX[a+1]=X[a+1]^RM1[a+1];
+      fX[a+2]=X[a+2]^RM1[a+2];
+      fX[a+3]=X[a+3]^RM1[a+3];

     }
 
  
     }
 
  

-    for(int a=0;a<h2;a+=4) {
+    /*   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]];
       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];
     
      for(int a=0;a<h2;a+=4) {
       fX[a]=fX[a]^seq_in[ind2+a];


@@ -420,6 +415,7 @@ int main(int argc, char** argv) {
   
   if(lena==1) {
     load_RGB_pixmap("lena.ppm", &width, &height, &data_R, &data_G, &data_B);
   
   if(lena==1) {
     load_RGB_pixmap("lena.ppm", &width, &height, &data_R, &data_G, &data_B);

+//    load_RGB_pixmap("8192.ppm", &width, &height, &data_R, &data_G, &data_B);

     imsize=width*height*3;
 //  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
   }
     imsize=width*height*3;
 //  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);
   }


@@ -481,64 +477,67 @@ int main(int argc, char** argv) {
 
 
 
 
 
 

-  
+  int *Pbox=new int[len];
+  int *PboxRM=new int[h2];

   uchar Sbox1[256];
   uchar Sbox1[256];

-  rc4key(DK, Sbox1, 16);
-
-  uchar Sbox2[256];
-  rc4key(&DK[16], Sbox2, 16);
+  uchar Sbox2[256];  

   uchar Inv_Sbox1[256];
   uchar Inv_Sbox2[256];
   uchar Inv_Sbox1[256];
   uchar Inv_Sbox2[256];

-  inverse_tables(Sbox1,256,Inv_Sbox1);
-  inverse_tables(Sbox2,256,Inv_Sbox2);
+  uchar sc[256];  
+  uchar RM1[h2];
+  uchar RM2[h2];

 
 
 
 
 
 

+
+  double time_encrypt=0;
+  double time_decrypt=0;
+  
+
+  double t=TimeStart();  
+  rc4key(DK, Sbox1, 8);
+  
+  
+  rc4key(&DK[8], Sbox2, 8);
+  
+  rc4key(&DK[16], sc, 16);
+  
+  
+  prga(sc, h2, RM1);
+  
+  
+  rc4keyperm(&DK[32], len, rp, Pbox, 16);

   
   

-  uchar sc[256];
-  rc4key(&DK[32], sc, 16);

   
   

-  uchar outd[2*(h * h)];
-  prga(sc, 2*(h * h), outd);
+  rc4keyperm(&DK[48], h2, rp, PboxRM, 16);
+  
+  //time+=TimeStop(t);
+  //cout<<"Time initializaton "<<time<<endl;
+

 
 
 
 

-  uchar RM1[h*h];
-  uchar RM2[h*h];
-  for(int i=0;i<h2;i++){
-    RM1[i]=outd[i];
-    RM2[i]=outd[i+h2];
-  }
-             

 
 
 
 

-  
-    
-  
-  uchar keyp[16];
-  for (int i = 48; i < 64; i++)
-    keyp[i-48] = DK[i];

 
 

-//  cout<<len<<endl;
-  int *Pbox=new int[len];
-  int *PboxRM=new int[h2];

 
 

-  rc4keyperm(keyp, len, rp, Pbox, 16);

 
 

-//  printf("len %d\n",len);
-  for(int i=0;i<len;i++) {
-//    printf("%d \n",Pbox[i]);
-  }
-  
-  rc4keyperm(RM2, h2, rp, PboxRM, h2);

 
 

+
+  

   for(int i=0;i<h2;i++){
     RM2[i]=RM1[i];
   }
 
   
   for(int i=0;i<h2;i++){
     RM2[i]=RM1[i];
   }
 
   

- 
- double time=0;
-  double t=TimeStart();
+  inverse_tables(Sbox1,256,Inv_Sbox1);
+  inverse_tables(Sbox2,256,Inv_Sbox2);
+
+
+
+
+  
+  time_encrypt=0;
+  t=TimeStart();

 
   int i;
   switch(h) {
 
   int i;
   switch(h) {


@@ -590,11 +589,22 @@ int main(int argc, char** argv) {
       else
        encrypt<64*64>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
       
       else
        encrypt<64*64>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
       

+    }
+    break;
+  case 128: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+       encrypt_ctr<128*128>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+      else
+       encrypt<128*128>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+      

     }
     break;
   }
     }
     break;
   }

-  time+=TimeStop(t);
-  cout<<"Time encrypt "<<time<<endl;
+  time_encrypt+=TimeStop(t);
+  //cout<<"Time encrypt "<<
+  cout<<(double)imsize*nb_test/time_encrypt<<"\t";

 
 
   if(lena) {
 
 
   if(lena) {


@@ -607,7 +617,7 @@ int main(int argc, char** argv) {
   }
   
 
   }
   
 

-  time=0;
+  time_decrypt=0;

   t=TimeStart();
   switch(h) {
   case 4:
   t=TimeStart();
   switch(h) {
   case 4:


@@ -650,10 +660,19 @@ int main(int argc, char** argv) {
        decrypt<64*64>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
     }
     break;
        decrypt<64*64>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,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);
+      else
+       decrypt<128*128>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,0);
+    }
+    break;

   }
 
   }
 

-  time+=TimeStop(t);
-  cout<<"Time decrypt "<<time<<endl;
+  time_decrypt+=TimeStop(t);
+  //cout<<"Time decrypt "
+  cout<<(double)imsize*nb_test/time_decrypt<<"\t";

 
   if(lena) {
     for(int i=0;i<oneD;i++) {
 
   if(lena) {
     for(int i=0;i<oneD;i++) {