new

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index 6a26c6e4efb6ca2d65bab2fe762edb3c044d609a..1fe114c12aad36c0d4afc85a0d66a885ab31dd93 100644 (file)
--- a/OneRoundIoT/OneRound/one_round_new.cpp
+++ b/OneRoundIoT/OneRound/one_round_new.cpp
@@ -364,16 +364,24 @@ int main(int argc, char** argv) {
 
 
   int h=32;
 
 
   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
     if(strncmp(argv[i],"h",1)==0) h = atoi(&(argv[i][1]));          //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],"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("ctr %d\n",ctr);
   printf("h %d\n",h);
   }
 
   printf("nb times %d\n",nb_test);
   printf("ctr %d\n",ctr);
   printf("h %d\n",h);

+  printf("lena %d\n",lena);
+  printf("size_buf %d\n",size_buf);

 
   int h2=h*h;
   
 
   int h2=h*h;
   


@@ -401,23 +409,44 @@ 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);
+    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];
+    }

   }
 
 
   }
 
 


@@ -543,6 +572,16 @@ int main(int argc, char** argv) {
       else
        encrypt<32*32>(seq, seq2,len,RM1,Pbox,PboxRM,Sbox1,Sbox2,0);
       
       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;
   }
     }
     break;
   }


@@ -550,12 +589,14 @@ int main(int argc, char** argv) {
   cout<<"Time encrypt "<<time<<endl;
 
 
   cout<<"Time encrypt "<<time<<endl;
 
 

-  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=0;


@@ -593,18 +634,35 @@ int main(int argc, char** argv) {
        decrypt<32*32>(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,Sbox2,0);
     }
     break;
        decrypt<32*32>(seq2,seq,len,RM2,Pbox,PboxRM,Sbox1,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,Sbox1,Sbox2,0);
+    }
+    break;

   }
 
   time+=TimeStop(t);
   cout<<"Time decrypt "<<time<<endl;
 
   }
 
   time+=TimeStop(t);
   cout<<"Time decrypt "<<time<<endl;
 

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