update

[Cipher_code.git] / OneRoundIoT / EnhancedOneRound / enhanced_oneround.cpp

diff --git a/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp b/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
index db3d98c4b1907c0821ccb53f949572c9aad676c8..cefdb77fac970b487d6586eb8dbb420f43c94d0e 100644 (file)
--- a/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
+++ b/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
@@ -1459,7 +1459,7 @@ int main(int argc, char** argv) {
     if(strncmp(argv[i],"lena",4)==0) lena = atoi(&(argv[i][4]));          //Use Lena or 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("cbcrm %d\n",cbcrm);
   printf("cbcprng %d\n",cbcprng);
   printf("ecbrm %d\n",ecbrm);
   printf("cbcrm %d\n",cbcrm);
   printf("cbcprng %d\n",cbcprng);
   printf("ecbrm %d\n",ecbrm);


@@ -1467,7 +1467,7 @@ int main(int argc, char** argv) {
   printf("h %d\n",h);
   printf("lena %d\n",lena);
   printf("size_buf %d\n",size_buf);
   printf("h %d\n",h);
   printf("lena %d\n",lena);
   printf("size_buf %d\n",size_buf);

-
+*/

   
 
       
   
 
       


@@ -1510,8 +1510,8 @@ int main(int argc, char** argv) {
   }
   else {
     width=height=size_buf;
   }
   else {
     width=height=size_buf;

-    imsize=width*height;
-    cout<<"imsize "<<imsize<<endl;
+    imsize=width*height*3;
+    //cout<<"imsize "<<imsize<<endl;

     buffer=new uchar[imsize];
     for(int i=0;i<imsize;i++) {
       buffer[i]=lrand48();
     buffer=new uchar[imsize];
     for(int i=0;i<imsize;i++) {
       buffer[i]=lrand48();


@@ -1520,7 +1520,7 @@ int main(int argc, char** argv) {
 
 
 
 
 
 

-  
+  cout<<"imsize "<<imsize<<endl;

   
   uchar* seq= new uchar[imsize];
   uchar* seq2= new uchar[imsize];
   
   uchar* seq= new uchar[imsize];
   uchar* seq2= new uchar[imsize];


@@ -1534,7 +1534,7 @@ int main(int argc, char** argv) {
     }
   }
   else {
     }
   }
   else {

-    for(int i=0;i<oneD;i++) {
+    for(int i=0;i<oneD*3;i++) {

       seq[i]=buffer[i];
     }
   }
       seq[i]=buffer[i];
     }
   }


@@ -1598,27 +1598,30 @@ int main(int argc, char** argv) {
   
 
   double t=TimeStart();  
   
 
   double t=TimeStart();  

-  rc4key(DK, Sbox1, 8);
-  
-  
-  rc4key(&DK[8], Sbox2, 8);
-  
-  rc4key(&DK[16], sc, 16);
-  prga(sc, h*h*2+256, RM);
-

 
 

+  for(int i=0;i<nb_test;i++) {

 
 

-
-  
-  rc4keyperm(&DK[72], len, rp, Pbox, 16);
+    rc4key(DK, Sbox1, 8);

   
   
   
   

-  rc4keyperm(&DK[88], len/2, rp, PboxSRM2, 16);
+    rc4key(&DK[8], Sbox2, 8);
+    
+    rc4key(&DK[16], sc, 16);
+    prga(sc, h*h*2+256, RM);
+    
+

 
 

-  for(int i=0;i<len/2;i++) {
-    PboxSRM[i]=PboxSRM2[i]&(h-1);
-  }

 
 

+  
+    rc4keyperm(&DK[72], len, rp, Pbox, 16);
+    
+    
+    rc4keyperm(&DK[88], len/2, rp, PboxSRM2, 16);
+    
+    for(int i=0;i<len/2;i++) {
+      PboxSRM[i]=PboxSRM2[i]&(h-1);
+    }
+    

 /*
   for(int i=0;i<h*2;i++) {
     for(int j=0;j<h;j++)
 /*
   for(int i=0;i<h*2;i++) {
     for(int j=0;j<h;j++)


@@ -1626,11 +1629,11 @@ int main(int argc, char** argv) {
     cout<<endl;
   }
 */
     cout<<endl;
   }
 */

+  }

 
 

-
-  
-  //time+=TimeStop(t);
-  //cout<<"Time initializaton "<<time<<endl;
+  double time_init=0;
+  time_init+=TimeStop(t);
+  cout<<"Time initializaton nb times "<<nb_test<<"   = "<<time_init<<endl;

 
 
 
 
 
 


@@ -1756,7 +1759,7 @@ int main(int argc, char** argv) {
 
 
   time_encrypt+=TimeStop(t);
 
 
   time_encrypt+=TimeStop(t);

-  //cout<<"Time encrypt "<<
+  cout<<"Time encrypt "<<time_encrypt<<endl;

   cout<<(double)imsize*nb_test/time_encrypt<<"\t";
 
 
   cout<<(double)imsize*nb_test/time_encrypt<<"\t";
 
 


@@ -1883,7 +1886,7 @@ int main(int argc, char** argv) {
        equal=false;
       }
     }
        equal=false;
       }
     }

-    cout<<"RESULT CORRECT: "<<equal<<endl;
+    //cout<<"RESULT CORRECT: "<<equal<<endl;

   }
   
 
   }