update

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

diff --git a/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp b/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
index e13650b2b55989432935c2ced3c3c48b0f7b2552..d8e1cbe1e3958973f8d25f1fe5c52d470d0f8130 100644 (file)
--- a/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
+++ b/OneRoundIoT/EnhancedOneRound/enhanced_oneround.cpp
@@ -1510,7 +1510,7 @@ int main(int argc, char** argv) {
   }
   else {
     width=height=size_buf;
   }
   else {
     width=height=size_buf;

-    imsize=width*height;
+    imsize=width*height*3;

     //cout<<"imsize "<<imsize<<endl;
     buffer=new uchar[imsize];
     for(int i=0;i<imsize;i++) {
     //cout<<"imsize "<<imsize<<endl;
     buffer=new uchar[imsize];
     for(int i=0;i<imsize;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;
   }
 */

-
+  }

 
   double time_init=0;
   time_init+=TimeStop(t);
 
   double time_init=0;
   time_init+=TimeStop(t);

-  cout<<"Time initializaton "<<time_init<<endl;
+  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";