X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/Cipher_code.git/blobdiff_plain/af833d9849d82e81367b4faa192580e6b07fca47..c8ade3a0564c33e550ca7d51195945fcebd76b4b:/OneRoundIoT/OneRound/one_round_new.cpp

diff --git a/OneRoundIoT/OneRound/one_round_new.cpp b/OneRoundIoT/OneRound/one_round_new.cpp
index 909593e..d068226 100644
--- 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;
 
   
-   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+1]=Sbox1[(a+1)&0xFF];
+     X[a+2]=Sbox1[(a+2)&0xFF];
+     X[a+3]=Sbox1[(a+3)&0xFF];           
    }
 
    
@@ -164,12 +167,11 @@ void encrypt_ctr(uchar* seq_in, uchar *seq_out, int len,uchar* RM1,int *Pbox, in
        
 
     for(int a=0;a<h2;a+=4) {
-      X[a]=X[Sbox1[a]];
-      X[a+1]=X[Sbox1[a+1]];
-      X[a+2]=X[Sbox1[a+2]];
-      X[a+3]=X[Sbox1[a+3]];
+      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]];
     }
-    
    
 
     
@@ -487,7 +489,10 @@ int main(int argc, char** argv) {
 
 
 
-  double time=0;
+  double time_encrypt=0;
+  double time_decrypt=0;
+  
+
   double t=TimeStart();  
   rc4key(DK, Sbox1, 8);
   
@@ -505,8 +510,8 @@ int main(int argc, char** argv) {
   
   rc4keyperm(&DK[48], h2, rp, PboxRM, 16);
   
-  time+=TimeStop(t);
-  cout<<"Time initializaton "<<time<<endl;
+  //time+=TimeStop(t);
+  //cout<<"Time initializaton "<<time<<endl;
 
 
 
@@ -530,7 +535,7 @@ int main(int argc, char** argv) {
 
 
   
-  time=0;
+  time_encrypt=0;
   t=TimeStart();
 
   int i;
@@ -596,8 +601,9 @@ int main(int argc, char** argv) {
     }
     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) {
@@ -610,7 +616,7 @@ int main(int argc, char** argv) {
   }
   
 
-  time=0;
+  time_decrypt=0;
   t=TimeStart();
   switch(h) {
   case 4:
@@ -663,8 +669,9 @@ int main(int argc, char** argv) {
     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++) {