add cmac 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 6d9f431031a209bf115f49f62146ffc8079c9398..be38534e2b865310957a7877e6fe942e46800315 100644 (file)
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -30,10 +30,10 @@ using namespace std;
 int key_size=256;
 int nb_test=1;
 int ctr=0;
 int key_size=256;
 int nb_test=1;
 int ctr=0;

-int h=64;

 
 
 
 

-int h2=h*h;
+
+

 
 
 
 
 
 


@@ -123,7 +123,7 @@ void prga(uchar *sc, int ldata, uchar *r) {
   uchar j0=0;
 
   for (int it=0; it<ldata; it++) {
   uchar j0=0;
 
   for (int it=0; it<ldata; it++) {

-    i0 = ((i0+1)%255);
+    i0 = ((i0+1)&0xFE); //%255);

     j0 = (j0 + sc[i0])&0xFF;
     uchar tmp = sc[i0];
     sc[i0] = sc[j0];
     j0 = (j0 + sc[i0])&0xFF;
     uchar tmp = sc[i0];
     sc[i0] = sc[j0];


@@ -135,17 +135,23 @@ 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) {
 
 
 void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, int enc) {
 
 

-  uchar *X=new uchar[h2];
-  uchar *fX=new uchar[h2];
+//  uchar *X=new uchar[h2];
+//  uchar *fX=new uchar[h2];
+  uchar X[h2];
+  uchar fX[h2];
+  

   int ind1,ind2;
 
   int ind1,ind2;
 

-
-   for(int a=0;a<h2;a++) {
-     X[a]=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];           

    }
 
    
    }
 
    


@@ -160,28 +166,62 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
     }
        
 
     }
        
 

-
-    for(int a=0;a<h2;a++){
-      fX[a]=Sbox1[RM1[X[a]]];
+    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]];

     }
     }

+   
+

     
     

+//    *(int*)&fX[0]^=it;

 
 

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

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

       RM1[a]=RM1[PboxRM[a]];
       RM1[a]=RM1[PboxRM[a]];

+      RM1[a+1]=RM1[PboxRM[a+1]];
+      RM1[a+2]=RM1[PboxRM[a+2]];
+      RM1[a+3]=RM1[PboxRM[a+3]];

     }
 
 
     }
 
 


@@ -192,75 +232,61 @@ 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, int debug) {
 
 

-  uchar *X=new uchar[h2];
+/*  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 *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 it=0;it<len;it++) {
     int ind1=it*h2;
     int ind2=Pbox[it]*h2;
 

-    for(int a=0;a<h2;a+=1) {
+    for(int a=0;a<h2;a+=4) {

       X[a]=seq_in[ind2+a];
       X[a]=seq_in[ind2+a];

-/*      X[a+1]=seq_in[ind2+a+1];
+      X[a+1]=seq_in[ind2+a+1];

       X[a+2]=seq_in[ind2+a+2];
       X[a+3]=seq_in[ind2+a+3];
       X[a+2]=seq_in[ind2+a+2];
       X[a+3]=seq_in[ind2+a+3];

-      /*      X[a+4]=seq_in[ind2+a+4];                                                                                                                                    
-      X[a+5]=seq_in[ind2+a+5];                                                                                                                                            
-      X[a+6]=seq_in[ind2+a+6];                                                                                                                                            
-      X[a+7]=seq_in[ind2+a+7];*/

     }
 
     }
 

-    for(int a=0;a<h2;a+=1){
+    for(int a=0;a<h2;a+=4){

       fX[a]=Sbox1[X[a]];
       fX[a]=Sbox1[X[a]];

-/*      fX[a+1]=Sbox1[X[a+1]];
+      fX[a+1]=Sbox1[X[a+1]];

       fX[a+2]=Sbox1[X[a+2]];
       fX[a+3]=Sbox1[X[a+3]];
       fX[a+2]=Sbox1[X[a+2]];
       fX[a+3]=Sbox1[X[a+3]];

-      /*      fX[a+4]=Sbox1[X[a+4]];                                                                                                                                      
-      fX[a+5]=Sbox1[X[a+5]];                                                                                                                                              
-      fX[a+6]=Sbox1[X[a+6]];                                                                                                                                              
-      fX[a+7]=Sbox1[X[a+7]];*/

     }
 
 
     }
 
 

-    for(int a=0;a<h2;a+=1) {
+    for(int a=0;a<h2;a+=4) {

       fX[a]=fX[a]^RM1[a];
       fX[a]=fX[a]^RM1[a];

-/*      fX[a+1]=fX[a+1]^RM1[a+1];
+      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+2]=fX[a+2]^RM1[a+2];
       fX[a+3]=fX[a+3]^RM1[a+3];

-      /*      fX[a+4]=fX[a+4]^RM1[a+4];                                                                                                                                   
-      fX[a+5]=fX[a+5]^RM1[a+5];                                                                                                                                           
-      fX[a+6]=fX[a+6]^RM1[a+6];                                                                                                                                           
-      fX[a+7]=fX[a+7]^RM1[a+7];*/

     }
 
 
     }
 
 

-    for(int a=0;a<h2;a+=1) {
+    for(int a=0;a<h2;a+=4) {

       seq_out[ind1+a]=Sbox2[fX[a]];
       seq_out[ind1+a]=Sbox2[fX[a]];

-/*      seq_out[ind1+a+1]=Sbox2[fX[a+1]];
+      seq_out[ind1+a+1]=Sbox2[fX[a+1]];

       seq_out[ind1+a+2]=Sbox2[fX[a+2]];
       seq_out[ind1+a+3]=Sbox2[fX[a+3]];
       seq_out[ind1+a+2]=Sbox2[fX[a+2]];
       seq_out[ind1+a+3]=Sbox2[fX[a+3]];

-      /*      seq_out[ind1+a+4]=Sbox2[fX[a+4]];                                                                                                                           
-      seq_out[ind1+a+5]=Sbox2[fX[a+5]];                                                                                                                                   
-      seq_out[ind1+a+6]=Sbox2[fX[a+6]];                                                                                                                                   
-      seq_out[ind1+a+7]=Sbox2[fX[a+7]];*/

     }
 
     }
 

-    for(int a=0;a<h2;a+=1) {
+    for(int a=0;a<h2;a+=4) {

       RM1[a]=RM1[PboxRM[a]];
       RM1[a]=RM1[PboxRM[a]];

-/*      RM1[a+1]=RM1[PboxRM[a+1]];
+      RM1[a+1]=RM1[PboxRM[a+1]];

       RM1[a+2]=RM1[PboxRM[a+2]];
       RM1[a+3]=RM1[PboxRM[a+3]];
       RM1[a+2]=RM1[PboxRM[a+2]];
       RM1[a+3]=RM1[PboxRM[a+3]];

-      /*      RM1[a+4]=RM1[PboxRM[a+4]];                                                                                                                                  
-      RM1[a+5]=RM1[PboxRM[a+5]];                                                                                                                                          
-      RM1[a+6]=RM1[PboxRM[a+6]];                                                                                                                                          
-      RM1[a+7]=RM1[PboxRM[a+7]];*/
+

     }
 
 
     }
 
 


@@ -272,19 +298,15 @@ void encrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
 }
 
 
 }
 
 

-
-void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *PboxRM, uchar *Sbox1, uchar *Sbox2, int debug) {
-
-
-  uchar *fX=new uchar[h2];
+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) {

 
 
 
 

+  /*uchar *fX=new uchar[h2];

   uchar *Inv_Sbox1=new uchar[256];
   uchar *Inv_Sbox1=new uchar[256];

-  inverse_tables(Sbox1,256,Inv_Sbox1);
-

   uchar *Inv_Sbox2=new uchar[256];
   uchar *Inv_Sbox2=new uchar[256];

-  inverse_tables(Sbox2,256,Inv_Sbox2);
-  
+  */
+  uchar fX[h2];

 
 
 
 
 
 


@@ -296,22 +318,38 @@ void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
 
 
 
 
 
 

-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {

       fX[a]=seq_in[ind1+a];
       fX[a]=seq_in[ind1+a];

+      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++) {
+    for(int a=0;a<h2;a+=4) {

       fX[a]=Inv_Sbox2[fX[a]];
       fX[a]=Inv_Sbox2[fX[a]];

+      fX[a+1]=Inv_Sbox2[fX[a+1]];
+      fX[a+2]=Inv_Sbox2[fX[a+2]];
+      fX[a+3]=Inv_Sbox2[fX[a+3]];

     }
     }

-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {

       fX[a]=fX[a]^RM1[a];
       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];

     }
 
     }
 

-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {

       RM1[a]=RM1[PboxRM[a]];
       RM1[a]=RM1[PboxRM[a]];

+      RM1[a+1]=RM1[PboxRM[a+1]];
+      RM1[a+2]=RM1[PboxRM[a+2]];
+      RM1[a+3]=RM1[PboxRM[a+3]];

     }
     
     }
     

-    for(int a=0;a<h2;a++) {
+    for(int a=0;a<h2;a+=4) {

       seq_out[ind2+a]=Inv_Sbox1[fX[a]];
       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]];

     }
 
      
     }
 
      


@@ -324,32 +362,32 @@ void decrypt(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, int *P
 int main(int argc, char** argv) {
 
 
 int main(int argc, char** argv) {
 
 

+  int h=32;
+  int lena=0;
+  int size_buf=1;
+
+
+  

   for(int i=1; i<argc; i++){
     if(strncmp(argv[i],"nb",2)==0)    nb_test = atoi(&(argv[i][2]));    //nb of test         
     if(strncmp(argv[i],"ctr",3)==0) ctr = atoi(&(argv[i][3]));          //CTR ? 1  otherwise CBC like
   for(int i=1; i<argc; i++){
     if(strncmp(argv[i],"nb",2)==0)    nb_test = atoi(&(argv[i][2]));    //nb of test         
     if(strncmp(argv[i],"ctr",3)==0) ctr = atoi(&(argv[i][3]));          //CTR ? 1  otherwise CBC like

-    if(strncmp(argv[i],"h",1)==0) h = atoi(&(argv[i][1]));          //CTR ? 1  otherwise CBC like
+    if(strncmp(argv[i],"h",1)==0) h = atoi(&(argv[i][1]));          //size of block
+    if(strncmp(argv[i],"sizebuf",7)==0) size_buf = atoi(&(argv[i][7]));          //SIZE of the buffer
+    if(strncmp(argv[i],"lena",4)==0) lena = atoi(&(argv[i][4]));          //Use Lena or buffer

   }
 
   }
 

-  printf("nb times %d\n",nb_test);
+/*  printf("nb times %d\n",nb_test);

   printf("ctr %d\n",ctr);
   printf("h %d\n",h);
   printf("ctr %d\n",ctr);
   printf("h %d\n",h);

-
-  h2=h*h;
-  
-/*
-  if(argc==2)
-    nb_test=atoi(argv[1]);
-  if(nb_test<=0 || nb_test>10000) {
-    printf("nb tests is not correct\n");
-    exit(0);
-  }
-  else
-    printf("nb tests = %d\n\n",nb_test);
+  printf("lena %d\n",lena);
+  printf("size_buf %d\n",size_buf);

 */
 */

+  int h2=h*h;
+  

 
       
   int seed=time(NULL);
 
       
   int seed=time(NULL);

-  cout<<seed<<endl;
+//  cout<<seed<<endl;

   srand48(seed);
 
   uchar Secretkey[key_size];
   srand48(seed);
 
   uchar Secretkey[key_size];


@@ -370,23 +408,45 @@ int main(int argc, char** argv) {
 
   int width;
   int height;
 
   int width;
   int height;

+

   uchar *data_R, *data_G, *data_B;
   uchar *data_R, *data_G, *data_B;

-  load_RGB_pixmap("lena.ppm", &width, &height, &data_R, &data_G, &data_B);
+  int imsize;
+  uchar *buffer;
+  
+  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);
 //  load_RGB_pixmap("No_ecb_mode_picture.ppm", &width, &height, &data_R, &data_G, &data_B);

-
+  }
+  else {
+    width=height=size_buf;
+    imsize=width*height;
+    buffer=new uchar[imsize];
+    for(int i=0;i<imsize;i++) {
+      buffer[i]=lrand48();
+    }
+  }

 
 
 
   
 
 
 
   

-  int imsize=width*height*3;
+  

   uchar* seq= new uchar[imsize];
   uchar* seq2= new uchar[imsize];
 
   int oneD=width*height;
   uchar* seq= new uchar[imsize];
   uchar* seq2= new uchar[imsize];
 
   int oneD=width*height;

-  for(int i=0;i<oneD;i++) {
-    seq[i]=data_R[i];
-    seq[oneD+i]=data_G[i];
-    seq[2*oneD+i]=data_B[i];
+  if(lena) {
+    for(int i=0;i<oneD;i++) {
+      seq[i]=data_R[i];
+      seq[oneD+i]=data_G[i];
+      seq[2*oneD+i]=data_B[i];
+    }
+  }
+  else {
+    for(int i=0;i<oneD;i++) {
+      seq[i]=buffer[i];
+    }

   }
 
 
   }
 
 


@@ -409,7 +469,7 @@ int main(int argc, char** argv) {
   }
 
   
   }
 
   

-  cout<<"hash "<<endl;
+//  cout<<"hash "<<endl;

   for (int i = 0; i < 64 ; i++) {
 //    DK[i]=digest[i];
     DK[i]=mix[i];
   for (int i = 0; i < 64 ; i++) {
 //    DK[i]=digest[i];
     DK[i]=mix[i];


@@ -417,95 +477,221 @@ 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];  
+  uchar Inv_Sbox1[256];
+  uchar Inv_Sbox2[256];
+  uchar sc[256];  
+  uchar RM1[h2];
+  uchar RM2[h2];

 
 

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

 
 
 
 

+
+  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);

   
   

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

   
   

-  uchar outd[2*(h * h)];
-  prga(sc, 2*(h * h), outd);
+  rc4keyperm(&DK[32], len, rp, Pbox, 16);
+  
+  
+  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;
 
   int i;

-  for(i=0;i<nb_test;i++)
-  {
-//    encrypt(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
-    encrypt_ctr(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+  switch(h) {
+  case 4: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+       encrypt_ctr<4*4>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+      else
+       encrypt<4*4>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+      
+    }
+    break;
+  case 8: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+       encrypt_ctr<8*8>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+      else
+       encrypt<8*8>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+      
+    }
+    break;
+  case 16: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+       encrypt_ctr<16*16>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+      else
+       encrypt<16*16>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+      
+    }
+    break;
+  case 32: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+       encrypt_ctr<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+      else
+       encrypt<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
+      
+    }
+    break;
+  case 64: 
+    for(i=0;i<nb_test;i++)
+    {
+      if(ctr)
+       encrypt_ctr<64*64>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,1);
+      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;

   }
   }

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

 
 
 
 

-  for(int i=0;i<oneD;i++) {
-    data_R[i]=seq2[i];
-    data_G[i]=seq2[oneD+i];
-    data_B[i]=seq2[2*oneD+i];
+  if(lena) {
+    for(int i=0;i<oneD;i++) {
+      data_R[i]=seq2[i];
+      data_G[i]=seq2[oneD+i];
+      data_B[i]=seq2[2*oneD+i];
+    }
+    store_RGB_pixmap("lena2.ppm", data_R, data_G, data_B, width, height);

   }
   }

-  store_RGB_pixmap("lena2.ppm", data_R, data_G, data_B, width, height);                    

   
 
   
 

-  time=0;
+  time_decrypt=0;

   t=TimeStart();
   t=TimeStart();

-  for(i=0;i<nb_test;i++) {
-//    decrypt(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
-    encrypt_ctr(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+  switch(h) {
+  case 4:
+    for(i=0;i<nb_test;i++) {
+      if(ctr)
+       encrypt_ctr<4*4>(seq2, seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
+      else
+       decrypt<4*4>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,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);
+      else
+       decrypt<8*8>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,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);
+      else
+       decrypt<16*16>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,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);
+      else
+       decrypt<32*32>(seq2,seq,len,RM2,Pbox,PboxRM,Inv_Sbox1,Inv_Sbox2,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);
+      else
+       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";

 
 

-  
-  for(int i=0;i<oneD;i++) {
-    data_R[i]=seq[i];
-    data_G[i]=seq[oneD+i];
-    data_B[i]=seq[2*oneD+i];
+  if(lena) {
+    for(int i=0;i<oneD;i++) {
+      data_R[i]=seq[i];
+      data_G[i]=seq[oneD+i];
+      data_B[i]=seq[2*oneD+i];
+    }
+    store_RGB_pixmap("lena3.ppm", data_R, data_G, data_B, width, height);
+  }
+  else {
+    bool equal=true;
+    for(int i=0;i<imsize;i++) {
+      //cout<<(int)buffer[i]<<endl;
+      if(buffer[i]!=seq[i]) {
+       equal=false;
+      }
+    }
+//    cout<<"RESULT CORRECT: "<<equal<<endl;

   }
   }

-  store_RGB_pixmap("lena3.ppm", data_R, data_G, data_B, width, height);